get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used

Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2006-11-09 11:37:30 +00:00
parent 6c4d16556b
commit cbee7a6944
7 changed files with 14 additions and 8 deletions

View File

@@ -206,7 +206,9 @@ enum CodecID {
CODEC_ID_MP2= 0x15000,
CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */
CODEC_ID_AAC,
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
CODEC_ID_MPEG4AAC,
#endif
CODEC_ID_AC3,
CODEC_ID_DTS,
CODEC_ID_VORBIS,