summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-03 15:35:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-03 15:35:23 +0200
commitc208576cef0a97903bbeac4f580fa436605a5c3e (patch)
treed8e401af9f01949274cc27af3e51dde220d2adab /libavfilter
parentd3fc2db47e8595e737a1d58689d2bf29c9190c80 (diff)
parentc484b3af15f1b47fa260d9c9f233d1506e62090e (diff)
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Fix make checkheaders without opencl headers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/Makefile2
1 files changed, 2 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