From f10497042f092d56f82f536276d5998d7fd1e4c4 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 1 Jun 2015 00:52:28 -0300 Subject: [PATCH] nvenc: remove cuda.h requirement for nvenc_a Reviewed-by: Philip Langdale Signed-off-by: James Almer --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 748b6260eb..f691655a83 100755 --- a/configure +++ b/configure @@ -1672,6 +1672,7 @@ HEADERS_LIST=" asm_types_h cdio_paranoia_h cdio_paranoia_paranoia_h + cuda_h dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h dev_ic_bt8xx_h @@ -2196,13 +2197,13 @@ h263p_decoder_select="h263_decoder" h263p_encoder_select="h263_encoder" h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp" h264_decoder_suggest="error_resilience" -h264_nvenc_encoder_deps="nvenc" +h264_nvenc_encoder_deps="nvenc cuda_h" h264_qsv_decoder_deps="libmfx" h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel" h264_qsv_encoder_deps="libmfx" h264_qsv_encoder_select="qsvenc" hevc_decoder_select="bswapdsp cabac golomb videodsp" -hevc_nvenc_encoder_deps="nvenc" +hevc_nvenc_encoder_deps="nvenc cuda_h" huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp" huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp" iac_decoder_select="imc_decoder" @@ -4994,6 +4995,7 @@ check_func_headers glob.h glob enabled xlib && check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext +check_header cuda.h check_header direct.h check_header dlfcn.h check_header d3d11.h @@ -5216,7 +5218,6 @@ if enabled libdc1394; then fi if enabled nvenc; then - check_header cuda.h || die "ERROR: cuda.h not found."; check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found."; check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 5" || die "ERROR: NVENC API version 4 or older is not supported";