diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 15:35:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 15:35:23 +0200 |
| commit | c208576cef0a97903bbeac4f580fa436605a5c3e (patch) | |
| tree | d8e401af9f01949274cc27af3e51dde220d2adab | |
| parent | d3fc2db47e8595e737a1d58689d2bf29c9190c80 (diff) | |
| parent | c484b3af15f1b47fa260d9c9f233d1506e62090e (diff) | |
| download | ffmpeg-c208576cef0a97903bbeac4f580fa436605a5c3e.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix make checkheaders without opencl headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 9a12273fa1..277ff71d9e 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -222,6 +222,8 @@ OBJS-$(CONFIG_SHOWWAVES_FILTER) += avf_showwaves.o OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o +SKIPHEADERS-$(CONFIG_OPENCL) += deshake_kernel.h + TOOLS = graph2dot TESTPROGS = drawutils filtfmts formats diff --git a/libavutil/Makefile b/libavutil/Makefile index 92dea3b1ab..04dcdbbe1b 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -117,6 +117,7 @@ SKIPHEADERS = old_pix_fmts.h SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h +SKIPHEADERS-$(CONFIG_OPENCL) += opencl.h TESTPROGS = adler32 \ aes \ |