From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 13 Jan 2009 19:35:34 +0000 (+0000)
Subject: Let the mpeg audio parser correct the codec_id.
X-Git-Tag: v0.5~1206
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a14d138cb8be8a32c5ed4fb4d8aecb2aa1232236;p=platform%2Fupstream%2Flibav.git

Let the mpeg audio parser correct the codec_id.

Originally committed as revision 16582 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index 5573cac..55d865f 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