diff options
| author | Philip Langdale <philipl@overt.org> | 2019-02-20 19:57:53 -0800 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2019-02-27 18:03:17 +0100 |
| commit | 114ead9735f226e5824a15b94b32344436c96a71 (patch) | |
| tree | e2d5af98ffb3aeb6e2970c0530401df25f07f99d | |
| parent | b4c9c09915de8ffaa4a2d2606e85729afa6c4e8e (diff) | |
| download | ffmpeg-114ead9735f226e5824a15b94b32344436c96a71.tar.gz | |
configure: deprecate cuda_sdk dependency option
With all of our existing users of cuda_sdk switched over to ffnvcodec,
we could remove cuda_sdk completely and say that we should no longer
add code that requires the full sdk, and rather insist that such code
only use ffnvcodec.
As discussed previously, the use of nvcc from the sdk is still
supported with a distinct option.
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
| -rwxr-xr-x | configure | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -322,7 +322,6 @@ External library support: --disable-amf disable AMF video encoding code [autodetect] --disable-audiotoolbox disable Apple AudioToolbox code [autodetect] --enable-cuda-nvcc enable Nvidia CUDA compiler [no] - --enable-cuda-sdk enable CUDA features that require the CUDA SDK [no] --disable-cuvid disable Nvidia CUVID support [autodetect] --disable-d3d11va disable Microsoft Direct3D 11 video acceleration code [autodetect] --disable-dxva2 disable Microsoft DirectX 9 video acceleration code [autodetect] @@ -6036,6 +6035,11 @@ check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC" +if enabled cuda_sdk; then + warn "Option --enable-cuda-sdk is deprecated. Use --enable-cuda-nvcc instead." + enable cuda_nvcc +fi + if ! disabled ffnvcodec; then check_pkg_config ffnvcodec "ffnvcodec >= 8.1.24.2" \ "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" || \ @@ -6111,7 +6115,6 @@ done # these are off by default, so fail if requested and not available enabled cuda_nvcc && { check_nvcc || die "ERROR: failed checking for nvcc."; } -enabled cuda_sdk && require cuda_sdk cuda.h cuCtxCreate -lcuda enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint enabled decklink && { require_headers DeckLinkAPI.h && { test_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a090500" || die "ERROR: Decklink API version must be >= 10.9.5."; } } |