diff mbox

[FFmpeg-devel,2/3] configure: enable autodetected libraries after option parsing

Message ID 82837f8e-a5fc-0ed2-7048-42636d335429@googlemail.com
State Superseded
Headers show

Commit Message

Andreas Cadhalpun Nov. 30, 2016, 11:22 p.m. UTC
This is needed for the following patch.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
---
 configure | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Hendrik Leppkes Dec. 1, 2016, 10:01 a.m. UTC | #1
On Thu, Dec 1, 2016 at 12:22 AM, Andreas Cadhalpun
<andreas.cadhalpun@googlemail.com> wrote:
> This is needed for the following patch.
>
> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
> ---
>  configure | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/configure b/configure
> index 2ce7555..28c78ef 100755
> --- a/configure
> +++ b/configure
> @@ -3237,15 +3237,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"
> @@ -3491,6 +3482,15 @@ for e in $env; do
>      eval "export $e"
>  done
>
> +# 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
> +
>  disabled logging && logfile=/dev/null
>

If those are enabled after option parsing, doesn't this then prevent
me from turning them off?

- Hendrik
diff mbox

Patch

diff --git a/configure b/configure
index 2ce7555..28c78ef 100755
--- a/configure
+++ b/configure
@@ -3237,15 +3237,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"
@@ -3491,6 +3482,15 @@  for e in $env; do
     eval "export $e"
 done
 
+# 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
+
 disabled logging && logfile=/dev/null
 
 # Disable all the library-specific components if the library itself