# HG changeset patch
# User bcoudurier
# Date 1163072250 0
# Node ID 1e86218440405b39e04ca946708ea0a80fcb10ce
# Parent  4cd1a08486377e4d1b6ec58ef77195bbbf600101
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used

diff -r 4cd1a0848637 -r 1e8621844040 avcodec.h
--- a/avcodec.h	Thu Nov 09 01:23:47 2006 +0000
+++ b/avcodec.h	Thu Nov 09 11:37:30 2006 +0000
@@ -206,7 +206,9 @@
     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,
diff -r 4cd1a0848637 -r 1e8621844040 faad.c
--- a/faad.c	Thu Nov 09 01:23:47 2006 +0000
+++ b/faad.c	Thu Nov 09 11:37:30 2006 +0000
@@ -326,7 +326,9 @@
 
 // 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