diff options
| author | James Almer <jamrial@gmail.com> | 2016-11-24 13:39:13 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-11-24 13:50:43 -0300 |
| commit | d1de725beed3da2c1bb9c094b846e2f4370150cb (patch) | |
| tree | 3714c264d7fa55e5ff05a84922aa6a26d245eee0 | |
| parent | 8f5a2bed5eabd423db4a05521a96b71babeff332 (diff) | |
| download | ffmpeg-streaming-d1de725beed3da2c1bb9c094b846e2f4370150cb.zip ffmpeg-streaming-d1de725beed3da2c1bb9c094b846e2f4370150cb.tar.gz | |
cuda: check for cuda.h when enabled
Fixes make checkheaders on systems without the Cuda Toolkit, which
was broken after the dynlink changes.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1809,6 +1809,7 @@ HEADERS_LIST=" asm_types_h cdio_paranoia_h cdio_paranoia_paranoia_h + cuda_h dispatch_dispatch_h dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@ -5657,6 +5658,7 @@ done enabled avfoundation_indev && { check_header_objcc AVFoundation/AVFoundation.h || disable avfoundation_indev; } enabled avfoundation_indev && { check_lib2 CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics || check_lib2 ApplicationServices/ApplicationServices.h CGGetActiveDisplayList -framework ApplicationServices; } +enabled cuda && check_header cuda.h # this is not a dependency enabled cuvid && { enabled cuda || die "ERROR: CUVID requires CUDA"; } enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint diff --git a/libavutil/Makefile b/libavutil/Makefile index 732961a..c61ca9c 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -166,7 +166,8 @@ OBJS += $(COMPAT_OBJS:%=../compat/%) # Windows resource file SLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o -SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda.h +SKIPHEADERS-$(HAVE_CUDA_H) += hwcontext_cuda.h +SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda_internal.h SKIPHEADERS-$(CONFIG_DXVA2) += hwcontext_dxva2.h SKIPHEADERS-$(CONFIG_QSV) += hwcontext_qsv.h SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h |
