Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.0
| @@ -232,7 +232,7 @@ OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o | |||||
| OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o | OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o | ||||
| SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h | SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h | ||||
| SKIPHEADERS-$(CONFIG_OPENCL) += opencl_internal.h deshake_kernel.h unsharp_kernel.h | |||||
| SKIPHEADERS-$(CONFIG_OPENCL) += opencl_internal.h deshake_opencl_kernel.h unsharp_opencl_kernel.h | |||||
| TOOLS = graph2dot | TOOLS = graph2dot | ||||
| TESTPROGS = drawutils filtfmts formats | TESTPROGS = drawutils filtfmts formats | ||||
| @@ -19,8 +19,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef AVFILTER_DESHAKE_KERNEL_H | |||||
| #define AVFILTER_DESHAKE_KERNEL_H | |||||
| #ifndef AVFILTER_DESHAKE_OPENCL_KERNEL_H | |||||
| #define AVFILTER_DESHAKE_OPENCL_KERNEL_H | |||||
| #include "libavutil/opencl.h" | #include "libavutil/opencl.h" | ||||
| @@ -214,4 +214,4 @@ kernel void avfilter_transform(global unsigned char *src, | |||||
| } | } | ||||
| ); | ); | ||||
| #endif /* AVFILTER_DESHAKE_KERNEL_H */ | |||||
| #endif /* AVFILTER_DESHAKE_OPENCL_KERNEL_H */ | |||||
| @@ -21,8 +21,8 @@ | |||||
| #include "opencl_allkernels.h" | #include "opencl_allkernels.h" | ||||
| #if CONFIG_OPENCL | #if CONFIG_OPENCL | ||||
| #include "libavutil/opencl.h" | #include "libavutil/opencl.h" | ||||
| #include "deshake_kernel.h" | |||||
| #include "unsharp_kernel.h" | |||||
| #include "deshake_opencl_kernel.h" | |||||
| #include "unsharp_opencl_kernel.h" | |||||
| #endif | #endif | ||||
| #define OPENCL_REGISTER_KERNEL_CODE(X, x) \ | #define OPENCL_REGISTER_KERNEL_CODE(X, x) \ | ||||
| @@ -18,8 +18,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef AVFILTER_UNSHARP_KERNEL_H | |||||
| #define AVFILTER_UNSHARP_KERNEL_H | |||||
| #ifndef AVFILTER_UNSHARP_OPENCL_KERNEL_H | |||||
| #define AVFILTER_UNSHARP_OPENCL_KERNEL_H | |||||
| #include "libavutil/opencl.h" | #include "libavutil/opencl.h" | ||||
| @@ -134,4 +134,4 @@ kernel void unsharp(global unsigned char *src, | |||||
| ); | ); | ||||
| #endif /* AVFILTER_UNSHARP_KERNEL_H */ | |||||
| #endif /* AVFILTER_UNSHARP_OPENCL_KERNEL_H */ | |||||