summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-30 23:49:35 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-12-10 19:29:37 +0100
commit4c455664930470727000c7a8b2d550ec29f512e3 (patch)
tree1c51ca8323e39ac67ad22610ef9579dbbd70e538 /configure
parentc50d591ce2a6dc9d0c31fb651edeb167add7c3fc (diff)
downloadffmpeg-4c455664930470727000c7a8b2d550ec29f512e3.tar.gz
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@googlemail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure18
1 files changed, 9 insertions, 9 deletions
diff --git a/configure b/configure
index 50877bb293..04fa06cd6f 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