diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:24:04 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:24:04 +0000 |
| commit | cb0355537d6a89fc71fbc672ad5dba8a1eadce34 (patch) | |
| tree | 111a7e3e125acc80d3a06b9cbfdfbc05aea35b29 /libavutil/Makefile | |
| parent | 0d4c0240affc09eb2c9f6ccacac2ed14321b1e34 (diff) | |
| parent | d847a40888c064cc8c35b546fc5a0ccb69136a7c (diff) | |
| download | ffmpeg-cb0355537d6a89fc71fbc672ad5dba8a1eadce34.tar.gz | |
Merge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'
* commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c':
hwcontext_cuda/vdpau: add to skipheaders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 542a80cd1e..a4d79cdd88 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -160,6 +160,8 @@ OBJS += $(COMPAT_OBJS:%=../compat/%) # Windows resource file SLIBOBJS-$(HAVE_GNU_WINDRES) += avutilres.o +SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda.h +SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h |