summaryrefslogtreecommitdiff
path: root/libavcodec/mpegaudio_parser.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-01-13 19:35:34 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-01-13 19:35:34 +0000
commita14d138cb8be8a32c5ed4fb4d8aecb2aa1232236 (patch)
tree30f2bcdd98068346b6a358a03f9e3946a8ec8306 /libavcodec/mpegaudio_parser.c
parentcb595b7f029297750e9fd98d0a4d12f2e2c38ea4 (diff)
downloadffmpeg-a14d138cb8be8a32c5ed4fb4d8aecb2aa1232236.tar.gz
Let the mpeg audio parser correct the codec_id.
Originally committed as revision 16582 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegaudio_parser.c')
-rw-r--r--libavcodec/mpegaudio_parser.c3
1 files changed, 3 insertions, 0 deletions
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