[FFmpeg-cvslog] mp3enc: fix CODEC_ID/CodecID that leaked in from older patch

Michael Niedermayer git at videolan.org
Sat Aug 11 02:05:52 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 11 01:25:19 2012 +0200| [bd6ece4609b49eb40f880252452b809bff8f13ec] | committer: Michael Niedermayer

mp3enc: fix CODEC_ID/CodecID that leaked in from older patch

Found-by: jamal <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd6ece4609b49eb40f880252452b809bff8f13ec
---

 libavformat/mp3enc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index a515fb1..1ecad04 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -370,10 +370,10 @@ static int mp2_write_trailer(struct AVFormatContext *s)
     return 0;
 }
 
-static int query_codec(enum CodecID id, int std_compliance)
+static int query_codec(enum AVCodecID id, int std_compliance)
 {
     CodecMime *cm= ff_id3v2_mime_tags;
-    while(cm->id != CODEC_ID_NONE) {
+    while(cm->id != AV_CODEC_ID_NONE) {
         if(id == cm->id)
             return MKTAG('A', 'P', 'I', 'C');
         cm++;



More information about the ffmpeg-cvslog mailing list