if (pkt->data && pkt->size >= 4) {
MPADecodeHeader mpah;
int av_unused base;
- uint32_t head = AV_RB32(pkt->data);
-
- if (ff_mpa_check_header(head) < 0) {
+ uint32_t h;
+
+ h = AV_RB32(pkt->data);
+ if (ff_mpa_check_header(h) == 0) {
+ avpriv_mpegaudio_decode_header(&mpah, h);
+ if (!mp3->initial_bitrate)
+ mp3->initial_bitrate = mpah.bit_rate;
+ if ((mpah.bit_rate == 0) || (mp3->initial_bitrate != mpah.bit_rate))
+ mp3->has_variable_bitrate = 1;
+ } else {
av_log(s, AV_LOG_WARNING, "Audio packet of size %d (starting with %08X...) "
- "is invalid, writing it anyway.\n", pkt->size, head);
- return ff_raw_write_packet(s, pkt);
+ "is invalid, writing it anyway.\n", pkt->size, h);
}
- avpriv_mpegaudio_decode_header(&mpah, head);
-
- if (!mp3->initial_bitrate)
- mp3->initial_bitrate = mpah.bit_rate;
- if ((mpah.bit_rate == 0) || (mp3->initial_bitrate != mpah.bit_rate))
- mp3->has_variable_bitrate = 1;
#ifdef FILTER_VBR_HEADERS
/* filter out XING and INFO headers. */