diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-05-17 11:38:30 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-05-17 11:38:30 +0000 |
| commit | 8f89843475110309d57077ed1d4aa405a623be1c (patch) | |
| tree | 584a6d6c574ae0d08e207726a3d8486316ec2f4e | |
| parent | 9f4aa353599b0c12c7364fd9fe80132da96f3eb7 (diff) | |
| download | ffmpeg-8f89843475110309d57077ed1d4aa405a623be1c.tar.gz | |
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
| -rw-r--r-- | libavcodec/allcodecs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 1587dadd0e..971cc5abb1 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); |