diff mbox

[FFmpeg-devel] configure: remove superfluous cuvid and nvdec checks

Message ID 20171125014918.172-1-jamrial@gmail.com
State Accepted
Commit 4af050c46e2a77fa86894cea5ba2d5f1d3e1f5ea
Headers show

Commit Message

James Almer Nov. 25, 2017, 1:49 a.m. UTC 
Both are autodetected, and their dependency on cuda is checked
elsewhere.

Fixes ticket #6849.
---
 configure | 4 ----
 1 file changed, 4 deletions(-)

Comments

Philip Langdale Nov. 25, 2017, 3:27 p.m. UTC | #1 
On Fri, 24 Nov 2017 22:49:18 -0300
James Almer <jamrial@gmail.com> wrote:

> Both are autodetected, and their dependency on cuda is checked
> elsewhere.
> 
> Fixes ticket #6849.
> ---
>  configure | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/configure b/configure
> index 3ec6407fb2..7769427ffb 100755
> --- a/configure
> +++ b/configure
> @@ -5816,10 +5816,6 @@ done
>  
>  # these are off by default, so fail if requested and not available
>  enabled cuda_sdk          && require cuda_sdk cuda.h cuCtxCreate
> -lcuda -enabled cuvid             && { enabled cuda ||
> -                               die "ERROR: CUVID requires CUDA"; }
> -enabled nvdec             && { enabled cuda ||
> -                               die "ERROR: NVDEC hwaccel requires
> CUDA"; } enabled chromaprint       && require chromaprint
> chromaprint.h chromaprint_get_version -lchromaprint enabled
> decklink          && { require_header DeckLinkAPI.h &&
> { check_cpp_condition DeckLinkAPIVersion.h
> "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a060100" || die "ERROR:
> Decklink API version must be >= 10.6.1."; } }

LGTM


--phil
James Almer Nov. 25, 2017, 3:55 p.m. UTC | #2 
On 11/25/2017 12:27 PM, Philip Langdale wrote:
> On Fri, 24 Nov 2017 22:49:18 -0300
> James Almer <jamrial@gmail.com> wrote:
> 
>> Both are autodetected, and their dependency on cuda is checked
>> elsewhere.
>>
>> Fixes ticket #6849.
>> ---
>>  configure | 4 ----
>>  1 file changed, 4 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 3ec6407fb2..7769427ffb 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5816,10 +5816,6 @@ done
>>  
>>  # these are off by default, so fail if requested and not available
>>  enabled cuda_sdk          && require cuda_sdk cuda.h cuCtxCreate
>> -lcuda -enabled cuvid             && { enabled cuda ||
>> -                               die "ERROR: CUVID requires CUDA"; }
>> -enabled nvdec             && { enabled cuda ||
>> -                               die "ERROR: NVDEC hwaccel requires
>> CUDA"; } enabled chromaprint       && require chromaprint
>> chromaprint.h chromaprint_get_version -lchromaprint enabled
>> decklink          && { require_header DeckLinkAPI.h &&
>> { check_cpp_condition DeckLinkAPIVersion.h
>> "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a060100" || die "ERROR:
>> Decklink API version must be >= 10.6.1."; } }
> 
> LGTM
> 
> 
> --phil

Pushed, thanks.
diff mbox

Patch

diff --git a/configure b/configure
index 3ec6407fb2..7769427ffb 100755
--- a/configure
+++ b/configure
@@ -5816,10 +5816,6 @@  done
 
 # these are off by default, so fail if requested and not available
 enabled cuda_sdk          && require cuda_sdk cuda.h cuCtxCreate -lcuda
-enabled cuvid             && { enabled cuda ||
-                               die "ERROR: CUVID requires CUDA"; }
-enabled nvdec             && { enabled cuda ||
-                               die "ERROR: NVDEC hwaccel requires CUDA"; }
 enabled chromaprint       && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint
 enabled decklink          && { require_header DeckLinkAPI.h &&
                                { check_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a060100" || die "ERROR: Decklink API version must be >= 10.6.1."; } }