summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--libavcodec/mpegaudio_parser.c3
-rw-r--r--libavformat/mov.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index 8c39825..021cba4 100644
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@@ -91,6 +91,9 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
avctx->bit_rate += (bit_rate - avctx->bit_rate) / (s->header_count - header_threshold);
}
}
+ if (avctx->codec_id == AV_CODEC_ID_MP3 && codec_id == AV_CODEC_ID_MP2) {
+ avctx->codec_id = AV_CODEC_ID_MP2;
+ }
if (s1->flags & PARSER_FLAG_COMPLETE_FRAMES) {
s->frame_size = 0;