summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhighgod0401 <highgod0401@gmail.com>2013-05-08 08:53:09 +0800
committerMichael Niedermayer <michaelni@gmx.at>2013-05-10 12:44:04 +0200
commit63e8fc4d8f0873fd23ffb945d63297c038f10c4e (patch)
tree2e6fcf00493566d11ca7b5d921226ad73733f091
parent0f05b72f19c0a07cf48c912d2a71c3fb5f7bc325 (diff)
lavfi: modify names of deshake_kernel.h and unsharp_kernel.h
Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/Makefile2
-rw-r--r--libavfilter/deshake_opencl_kernel.h (renamed from libavfilter/deshake_kernel.h)6
-rw-r--r--libavfilter/opencl_allkernels.c4
-rw-r--r--libavfilter/unsharp_opencl_kernel.h (renamed from libavfilter/unsharp_kernel.h)6
4 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 913f50211e..73a24dd9b5 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -232,7 +232,7 @@ OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o
OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o
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
TESTPROGS = drawutils filtfmts formats
diff --git a/libavfilter/deshake_kernel.h b/libavfilter/deshake_opencl_kernel.h
index 1eb06fee39..ca0bf839b1 100644
--- a/libavfilter/deshake_kernel.h
+++ b/libavfilter/deshake_opencl_kernel.h
@@ -19,8 +19,8 @@
* 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"
@@ -214,4 +214,4 @@ kernel void avfilter_transform(global unsigned char *src,
}
);
-#endif /* AVFILTER_DESHAKE_KERNEL_H */
+#endif /* AVFILTER_DESHAKE_OPENCL_KERNEL_H */
diff --git a/libavfilter/opencl_allkernels.c b/libavfilter/opencl_allkernels.c
index b4530c0b2e..6d80fa8598 100644
--- a/libavfilter/opencl_allkernels.c
+++ b/libavfilter/opencl_allkernels.c
@@ -21,8 +21,8 @@
#include "opencl_allkernels.h"
#if CONFIG_OPENCL
#include "libavutil/opencl.h"
-#include "deshake_kernel.h"
-#include "unsharp_kernel.h"
+#include "deshake_opencl_kernel.h"
+#include "unsharp_opencl_kernel.h"
#endif
#define OPENCL_REGISTER_KERNEL_CODE(X, x) \
diff --git a/libavfilter/unsharp_kernel.h b/libavfilter/unsharp_opencl_kernel.h
index dd65bc0a9a..0cc8e906b4 100644
--- a/libavfilter/unsharp_kernel.h
+++ b/libavfilter/unsharp_opencl_kernel.h
@@ -18,8 +18,8 @@
* 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"
@@ -134,4 +134,4 @@ kernel void unsharp(global unsigned char *src,
);
-#endif /* AVFILTER_UNSHARP_KERNEL_H */
+#endif /* AVFILTER_UNSHARP_OPENCL_KERNEL_H */