From a14d138cb8be8a32c5ed4fb4d8aecb2aa1232236 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 13 Jan 2009 19:35:34 +0000 Subject: [PATCH] Let the mpeg audio parser correct the codec_id. Originally committed as revision 16582 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegaudio_parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 5573cacb4f..55d865f266 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -58,13 +58,16 @@ int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, switch(s->layer) { case 1: + avctx->codec_id = CODEC_ID_MP1; *frame_size = 384; break; case 2: + avctx->codec_id = CODEC_ID_MP2; *frame_size = 1152; break; default: case 3: + avctx->codec_id = CODEC_ID_MP3; if (s->lsf) *frame_size = 576; else