[FFmpeg-cvslog] lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

highgod0401 git at videolan.org
Fri May 10 13:01:59 CEST 2013


ffmpeg | branch: master | highgod0401 <highgod0401 at gmail.com> | Wed May  8 08:53:09 2013 +0800| [63e8fc4d8f0873fd23ffb945d63297c038f10c4e] | committer: Michael Niedermayer

lavfi: modify names of deshake_kernel.h and unsharp_kernel.h

Reviewed-by: Stefano Sabatini <stefasab at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63e8fc4d8f0873fd23ffb945d63297c038f10c4e
---

 libavfilter/Makefile                                      |    2 +-
 libavfilter/{deshake_kernel.h => deshake_opencl_kernel.h} |    6 +++---
 libavfilter/opencl_allkernels.c                           |    4 ++--
 libavfilter/{unsharp_kernel.h => unsharp_opencl_kernel.h} |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 913f502..73a24dd 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
similarity index 98%
rename from libavfilter/deshake_kernel.h
rename to libavfilter/deshake_opencl_kernel.h
index 1eb06fe..ca0bf83 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 b4530c0..6d80fa8 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
similarity index 97%
rename from libavfilter/unsharp_kernel.h
rename to libavfilter/unsharp_opencl_kernel.h
index dd65bc0..0cc8e90 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 */



More information about the ffmpeg-cvslog mailing list