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
2006-11-09 11:37:30 +00:00
parent 6c4d16556b
commit cbee7a6944
7 changed files with 14 additions and 8 deletions
--- a/libavcodec/faad.c
+++ b/libavcodec/faad.c
@@ -326,7 +326,9 @@ AVCodec name ## _decoder = {    \

 // FIXME - raw AAC files - maybe just one entry will be enough
 AAC_CODEC(CODEC_ID_AAC, aac);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 // If it's mp4 file - usually embeded into Qt Mov
 AAC_CODEC(CODEC_ID_MPEG4AAC, mpeg4aac);
+#endif

 #undef AAC_CODEC