[Ffmpeg-cvslog] r8166 - trunk/libavcodec/avcodec.h

[bcoudurier]

Author: bcoudurier
Date: Thu Mar  1 11:24:07 2007
New Revision: 8166

Modified:
   trunk/libavcodec/avcodec.h

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

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Thu Mar  1 11:24:07 2007
@@ -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,