ffmpeg 0.10.16: also disable aacplus.

* Can be re-enabled if we add the lib as an ffmpeg dependency.
This commit is contained in:
Adrien Destugues
2015-12-31 12:57:27 +01:00
parent 437f645387
commit 949c30cd40

View File

@@ -1603,14 +1603,14 @@ index 7b3d63d..2975bd8 100644
2.2.2 2.2.2
From 3f1174fee00fbcff6b453339d1160fb7231290d9 Mon Sep 17 00:00:00 2001 From 84f3b6ae9a85fd5c9c7f1b1fec9f5c70fb28d4aa Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk> From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 27 Dec 2015 19:48:47 +0100 Date: Sun, 27 Dec 2015 19:48:47 +0100
Subject: filter out some more codecs for gcc2. Subject: filter out some more codecs for gcc2.
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 8c55fb3..1c50614 100644 index 8c55fb3..047a025 100644
--- a/libavcodec/allcodecs.c --- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c
@@ -128,7 +128,7 @@ void avcodec_register_all(void) @@ -128,7 +128,7 @@ void avcodec_register_all(void)
@@ -1662,6 +1662,16 @@ index 8c55fb3..1c50614 100644
REGISTER_DECODER (WMV3IMAGE, wmv3image); REGISTER_DECODER (WMV3IMAGE, wmv3image);
REGISTER_DECODER (WNV1, wnv1); REGISTER_DECODER (WNV1, wnv1);
REGISTER_DECODER (XAN_WC3, xan_wc3); REGISTER_DECODER (XAN_WC3, xan_wc3);
@@ -399,7 +407,9 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (XSUB, xsub);
/* external libraries */
+#if __GNUC__ > 2
REGISTER_ENCODER (LIBAACPLUS, libaacplus);
+#endif
REGISTER_DECODER (LIBCELT, libcelt);
REGISTER_ENCDEC (LIBDIRAC, libdirac);
REGISTER_ENCODER (LIBFAAC, libfaac);
-- --
2.2.2 2.2.2