avcodec/mpegaudio_parser: Delay setting codec_id if it appears wrong

Fixes mp1/mp3 in mp4 misdetection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · c33351f3e7
parent 5669ae8401
commit c33351f3e7
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@ -79,7 +79,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
                    s->header_count++;
                    s->frame_size = ret-4;

-                    if (s->header_count > 0) {
+                    if (s->header_count > 0 + (avctx->codec_id != AV_CODEC_ID_NONE && avctx->codec_id != codec_id)) {
                        avctx->sample_rate= sr;
                        avctx->channels   = channels;
                        s1->duration      = frame_size;