From: Diego Biurrun <diego@biurrun.de>
Date: Sat, 17 May 2008 11:38:30 +0000 (+0000)
Subject: The MPEG4AAC codec is provided by an external library and will be disabled
X-Git-Tag: v0.5~4745
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f89843475110309d57077ed1d4aa405a623be1c;p=platform%2Fupstream%2Flibav.git

The MPEG4AAC codec is provided by an external library and will be disabled
with the next libavcodec major version bump.

Originally committed as revision 13186 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 1587dad..971cc5a 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -195,7 +195,6 @@ void avcodec_register_all(void)
     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 @@ void avcodec_register_all(void)
     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);