[FFmpeg-cvslog] configure: enable autodetected libraries after option parsing
Andreas Cadhalpun
git at videolan.org
Sat Dec 10 20:45:09 EET 2016
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Wed Nov 30 23:49:35 2016 +0100| [4c455664930470727000c7a8b2d550ec29f512e3] | committer: Andreas Cadhalpun
configure: enable autodetected libraries after option parsing
And only enable them, if they haven't been disabled.
This is needed for the following patch.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c455664930470727000c7a8b2d550ec29f512e3
---
configure | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 50877bb..04fa06c 100755
--- a/configure
+++ b/configure
@@ -3238,15 +3238,6 @@ enable valgrind_backtrace
sws_max_filter_size_default=256
set_default sws_max_filter_size
-# Enable platform codecs by default.
-enable audiotoolbox
-
-# Enable hwaccels by default.
-enable d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
-enable xlib
-
-enable cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
-
# build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)'
LIBPREF="lib"
@@ -3492,6 +3483,15 @@ for e in $env; do
eval "export $e"
done
+# Enable platform codecs by default.
+enable_weak audiotoolbox
+
+# Enable hwaccels by default.
+enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
+enable_weak xlib
+
+enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
+
disabled logging && logfile=/dev/null
# Disable all the library-specific components if the library itself
More information about the ffmpeg-cvslog
mailing list