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

2016-12-01 Thread Andreas Cadhalpun 
On 02.12.2016 01:05, Hendrik Leppkes wrote:
> On Fri, Dec 2, 2016 at 12:27 AM, Andreas Cadhalpun
>  wrote:
>> On 01.12.2016 11:01, Hendrik Leppkes wrote:
>>> If those are enabled after option parsing, doesn't this then prevent
>>> me from turning them off?
>>
>> Good catch, they should only be enabled, if they haven't been disabled.
>> Updated patch is attached.
>>
> 
> I'm not 100% sure, but maybe enable_weak might work? It should only
> affect the value if its still entirely unset, which should be what we
> want?

I tested with --disable-vaapi and enable_weak indeed works.

> Would look nicer then the manual loopery.

I don't really mind either way, so attached is a patch with enable_weak.

Best regards,
Andreas

>From ab69118d3fe4dc2ee1c0011593ee635739b888a3 Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun 
Date: Wed, 30 Nov 2016 23:49:35 +0100
Subject: [PATCH 2/3] 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 
---
 configure | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 2ce7555..7c425e8 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_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
-- 
2.10.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2016-12-01 Thread Hendrik Leppkes 
On Fri, Dec 2, 2016 at 12:27 AM, Andreas Cadhalpun
 wrote:
> On 01.12.2016 11:01, Hendrik Leppkes wrote:
>> If those are enabled after option parsing, doesn't this then prevent
>> me from turning them off?
>
> Good catch, they should only be enabled, if they haven't been disabled.
> Updated patch is attached.
>

I'm not 100% sure, but maybe enable_weak might work? It should only
affect the value if its still entirely unset, which should be what we
want?
Would look nicer then the manual loopery.

- Hendrik
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2016-12-01 Thread Andreas Cadhalpun 
On 01.12.2016 11:01, Hendrik Leppkes wrote:
> If those are enabled after option parsing, doesn't this then prevent
> me from turning them off?

Good catch, they should only be enabled, if they haven't been disabled.
Updated patch is attached.

Best regards,
Andreas

>From 88b3c4ffc2b02ca7dad1febda7cd6e3e02b8cf5f Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun 
Date: Wed, 30 Nov 2016 23:49:35 +0100
Subject: [PATCH 2/3] 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 
---
 configure | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 2ce7555..c0f31a7 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,13 @@ for e in $env; do
 eval "export $e"
 done
 
+# Enable platform codecs by default.
+# Enable hwaccels by default.
+for lib in audiotoolbox d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc xlib \
+   cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder; do
+! disabled $lib && enable $lib
+done
+
 disabled logging && logfile=/dev/null
 
 # Disable all the library-specific components if the library itself
-- 
2.10.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2016-12-01 Thread Hendrik Leppkes 
On Thu, Dec 1, 2016 at 12:22 AM, Andreas Cadhalpun
 wrote:
> This is needed for the following patch.
>
> Signed-off-by: Andreas Cadhalpun 
> ---
>  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
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2016-11-30 Thread Andreas Cadhalpun 
This is needed for the following patch.

Signed-off-by: Andreas Cadhalpun 
---
 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
 
 # Disable all the library-specific components if the library itself
-- 
2.10.2

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel