Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix make checkheaders without opencl headers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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
 

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                                                         \