define MPEG4AAC id to AAC, and get rid of it and MP3LAME id with next major bump

Originally committed as revision 8166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-01 10:24:07 +00:00 · 2007-03-01 10:24:07 +00:00 · abd6a4fc53
commit abd6a4fc53
parent eb3c8c0b31
1 changed files with 3 additions and 0 deletions
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@ -249,8 +249,11 @@ enum CodecID {
                         stream (only used by libavformat) */
 };

+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 /* CODEC_ID_MP3LAME is absolete */
 #define CODEC_ID_MP3LAME CODEC_ID_MP3
+#define CODEC_ID_MPEG4AAC CODEC_ID_AAC
+#endif

 enum CodecType {
    CODEC_TYPE_UNKNOWN = -1,