ffmpeg | branch: master | Timo Rothenpieler <t...@rothenpieler.org> | Thu May 11 22:51:31 2017 +0200| [6a3740572dfeef2628a1c54ba61e7e413bfb55f8] | committer: Timo Rothenpieler
configure: add cuda-sdk for things requiring full CUDA sdk > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a3740572dfeef2628a1c54ba61e7e413bfb55f8 --- configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5ae5227868..8d67838aab 100755 --- a/configure +++ b/configure @@ -297,6 +297,7 @@ External library support: The following libraries provide various hardware acceleration features: --disable-audiotoolbox disable Apple AudioToolbox code [autodetect] --disable-cuda disable dynamically linked Nvidia CUDA code [autodetect] + --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] @@ -1598,6 +1599,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST=" " HWACCEL_LIBRARY_NONFREE_LIST=" + cuda_sdk libnpp " @@ -2716,7 +2718,7 @@ qsvenc_select="qsv" vaapi_encode_deps="vaapi" hwupload_cuda_filter_deps="cuda" -scale_npp_filter_deps="cuda libnpp" +scale_npp_filter_deps="cuda_sdk libnpp" nvenc_deps="cuda" nvenc_deps_any="dlopen LoadLibrary" @@ -5755,7 +5757,7 @@ done enabled avfoundation_indev && { check_header_objcc AVFoundation/AVFoundation.h || disable avfoundation_indev; } enabled avfoundation_indev && { check_lib avfoundation_indev CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics || check_lib avfoundation_indev ApplicationServices/ApplicationServices.h CGGetActiveDisplayList -framework ApplicationServices; } -enabled cuda && check_header cuda.h # this is not a dependency +enabled cuda_sdk && require cuda_sdk cuda.h cuCtxCreate -lcuda enabled cuvid && { enabled cuda || die "ERROR: CUVID requires CUDA"; } enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
