Commit 4c455664 authored by Andreas Cadhalpun's avatar 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: 's avatarAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
parent c50d591c
...@@ -3238,15 +3238,6 @@ enable valgrind_backtrace ...@@ -3238,15 +3238,6 @@ enable valgrind_backtrace
sws_max_filter_size_default=256 sws_max_filter_size_default=256
set_default sws_max_filter_size 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 # build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)' SHFLAGS='-shared -Wl,-soname,$$(@F)'
LIBPREF="lib" LIBPREF="lib"
...@@ -3492,6 +3483,15 @@ for e in $env; do ...@@ -3492,6 +3483,15 @@ for e in $env; do
eval "export $e" eval "export $e"
done 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 disabled logging && logfile=/dev/null
# Disable all the library-specific components if the library itself # Disable all the library-specific components if the library itself
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment