# HG changeset patch
# User diego
# Date 1211024310 0
# Node ID 6e7d36c1f94a1e7a434866c479355d24ba6027b3
# Parent  43bede126ef6b6649359253781170fbaa26aece6
The MPEG4AAC codec is provided by an external library and will be disabled
with the next libavcodec major version bump.

diff -r 43bede126ef6 -r 6e7d36c1f94a allcodecs.c
--- a/allcodecs.c	Sat May 17 10:20:01 2008 +0000
+++ b/allcodecs.c	Sat May 17 11:38:30 2008 +0000
@@ -195,7 +195,6 @@
     REGISTER_DECODER (MP3ON4, mp3on4);
     REGISTER_DECODER (MPC7, mpc7);
     REGISTER_DECODER (MPC8, mpc8);
-    REGISTER_DECODER (MPEG4AAC, mpeg4aac);
     REGISTER_DECODER (NELLYMOSER, nellymoser);
     REGISTER_DECODER (QDM2, qdm2);
     REGISTER_DECODER (RA_144, ra_144);
@@ -288,6 +287,9 @@
     REGISTER_ENCODER (LIBVORBIS, libvorbis);
     REGISTER_ENCODER (LIBX264, libx264);
     REGISTER_ENCODER (LIBXVID, libxvid);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+    REGISTER_DECODER (MPEG4AAC, mpeg4aac);
+#endif
 
     /* parsers */
     REGISTER_PARSER  (AAC, aac);