Unified · Split
| @@ -232,7 +232,7 @@ OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o · 231 unmodified lines | ||
| 232 | 232 | OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o |
| 233 | 233 | |
| 234 | 234 | SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h |
| 235 | −SKIPHEADERS-$(CONFIG_OPENCL) += opencl_internal.h deshake_kernel.h unsharp_kernel.h | |
| 235 | +SKIPHEADERS-$(CONFIG_OPENCL) += opencl_internal.h deshake_opencl_kernel.h unsharp_opencl_kernel.h | |
| 236 | 236 | |
| 237 | 237 | TOOLS = graph2dot |
| 238 | 238 | TESTPROGS = drawutils filtfmts formats |
| @@ -19,8 +19,8 @@ · 18 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | −#ifndef AVFILTER_DESHAKE_KERNEL_H | |
| 23 | −#define AVFILTER_DESHAKE_KERNEL_H | |
| 22 | +#ifndef AVFILTER_DESHAKE_OPENCL_KERNEL_H | |
| 23 | +#define AVFILTER_DESHAKE_OPENCL_KERNEL_H | |
| 24 | 24 | |
| 25 | 25 | #include "libavutil/opencl.h" |
| 26 | 26 | |
| @@ -214,4 +214,4 @@ kernel void avfilter_transform(global unsigned char *src, · 187 unmodified lines | ||
| 214 | 214 | } |
| 215 | 215 | ); |
| 216 | 216 | |
| 217 | −#endif /* AVFILTER_DESHAKE_KERNEL_H */ | |
| 217 | +#endif /* AVFILTER_DESHAKE_OPENCL_KERNEL_H */ | |
| @@ -21,8 +21,8 @@ · 20 unmodified lines | ||
| 21 | 21 | #include "opencl_allkernels.h" |
| 22 | 22 | #if CONFIG_OPENCL |
| 23 | 23 | #include "libavutil/opencl.h" |
| 24 | −#include "deshake_kernel.h" | |
| 25 | −#include "unsharp_kernel.h" | |
| 24 | +#include "deshake_opencl_kernel.h" | |
| 25 | +#include "unsharp_opencl_kernel.h" | |
| 26 | 26 | #endif |
| 27 | 27 | |
| 28 | 28 | #define OPENCL_REGISTER_KERNEL_CODE(X, x) \ |
| @@ -18,8 +18,8 @@ · 17 unmodified lines | ||
| 18 | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#ifndef AVFILTER_UNSHARP_KERNEL_H | |
| 22 | −#define AVFILTER_UNSHARP_KERNEL_H | |
| 21 | +#ifndef AVFILTER_UNSHARP_OPENCL_KERNEL_H | |
| 22 | +#define AVFILTER_UNSHARP_OPENCL_KERNEL_H | |
| 23 | 23 | |
| 24 | 24 | #include "libavutil/opencl.h" |
| 25 | 25 | |
| @@ -134,4 +134,4 @@ kernel void unsharp(global unsigned char *src, · 108 unmodified lines | ||
| 134 | 134 | |
| 135 | 135 | ); |
| 136 | 136 | |
| 137 | −#endif /* AVFILTER_UNSHARP_KERNEL_H */ | |
| 137 | +#endif /* AVFILTER_UNSHARP_OPENCL_KERNEL_H */ | |