summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/allcodecs.c4
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);