Commit 58b49f78 authored by Philip Langdale's avatar Philip Langdale

Revert "nvenc: remove cuda.h requirement for nvenc_a"

This reverts commit f1049704.
Signed-off-by: 's avatarPhilip Langdale <philipl@overt.org>
parent 728c82a5
...@@ -1673,7 +1673,6 @@ HEADERS_LIST=" ...@@ -1673,7 +1673,6 @@ HEADERS_LIST="
asm_types_h asm_types_h
cdio_paranoia_h cdio_paranoia_h
cdio_paranoia_paranoia_h cdio_paranoia_paranoia_h
cuda_h
dev_bktr_ioctl_bt848_h dev_bktr_ioctl_bt848_h
dev_bktr_ioctl_meteor_h dev_bktr_ioctl_meteor_h
dev_ic_bt8xx_h dev_ic_bt8xx_h
...@@ -2195,13 +2194,13 @@ h263p_decoder_select="h263_decoder" ...@@ -2195,13 +2194,13 @@ h263p_decoder_select="h263_decoder"
h263p_encoder_select="h263_encoder" h263p_encoder_select="h263_encoder"
h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp" h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp"
h264_decoder_suggest="error_resilience" h264_decoder_suggest="error_resilience"
h264_nvenc_encoder_deps="nvenc cuda_h" h264_nvenc_encoder_deps="nvenc"
h264_qsv_decoder_deps="libmfx" h264_qsv_decoder_deps="libmfx"
h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel" h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
h264_qsv_encoder_deps="libmfx" h264_qsv_encoder_deps="libmfx"
h264_qsv_encoder_select="qsvenc" h264_qsv_encoder_select="qsvenc"
hevc_decoder_select="bswapdsp cabac golomb videodsp" hevc_decoder_select="bswapdsp cabac golomb videodsp"
hevc_nvenc_encoder_deps="nvenc cuda_h" hevc_nvenc_encoder_deps="nvenc"
huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp" huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp" huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp"
iac_decoder_select="imc_decoder" iac_decoder_select="imc_decoder"
...@@ -4993,7 +4992,6 @@ check_func_headers glob.h glob ...@@ -4993,7 +4992,6 @@ check_func_headers glob.h glob
enabled xlib && enabled xlib &&
check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext
check_header cuda.h
check_header direct.h check_header direct.h
check_header dlfcn.h check_header dlfcn.h
check_header d3d11.h check_header d3d11.h
...@@ -5219,6 +5217,7 @@ if enabled libdc1394; then ...@@ -5219,6 +5217,7 @@ if enabled libdc1394; then
fi fi
if enabled nvenc; then 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_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found.";
check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 5" || check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 5" ||
die "ERROR: NVENC API version 4 or older is not supported"; die "ERROR: NVENC API version 4 or older is not supported";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment