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

[Stefano Sabatini]

On date Tuesday 2013-05-07 17:37:48 +0800, Wei Gao encoded:
> 2013/5/7 Clément Bœsch <ubitux at gmail.com>
> 
> > On Tue, May 07, 2013 at 02:14:45PM +0800, Wei Gao wrote:
> > > From 88d93247eb3678b580c99de6d53ef0152568a087 Mon Sep 17 00:00:00 2001
> > > From: highgod0401 <highgod0401 at gmail.com>
> > > Date: Tue, 7 May 2013 14:09:40 +0800
> > > Subject: [PATCH] lavfi: modify names of deshake_kernel.h and
> > unsharp_kernel.h
> > >
> > > ---
> > >
> >
> > There are some references in libavfilter/Makefile, which you need to
> > update.
> >
> Hi, thanks for your reviewing, the attachment is the patch
> 
> Thanks
> Best regards
> 
> >
> > --
> > Clément B.
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel at ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> >

> From 46bdcfbe218430925b94024cd2a2049dcdd46441 Mon Sep 17 00:00:00 2001
> From: highgod0401 <highgod0401 at gmail.com>
> Date: Tue, 7 May 2013 17:34:02 +0800
> Subject: [PATCH] lavfi: modify names of deshake_kernel.h and unsharp_kernel.h
> 
> ---
>  libavfilter/Makefile                                      | 2 +-
>  libavfilter/{deshake_kernel.h => deshake_opencl_kernel.h} | 2 +-
>  libavfilter/opencl_allkernels.c                           | 4 ++--
>  libavfilter/{unsharp_kernel.h => unsharp_opencl_kernel.h} | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
>  rename libavfilter/{deshake_kernel.h => deshake_opencl_kernel.h} (99%)
>  rename libavfilter/{unsharp_kernel.h => unsharp_opencl_kernel.h} (99%)
> 
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index f0e703e..8efbbbd 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 99%
> rename from libavfilter/deshake_kernel.h
> rename to libavfilter/deshake_opencl_kernel.h
> index 1eb06fe..912ee32 100644
> --- a/libavfilter/deshake_kernel.h
> +++ b/libavfilter/deshake_opencl_kernel.h
> @@ -214,4 +214,4 @@ kernel void avfilter_transform(global  unsigned char *src,
>  }
>  );
>  
> -#endif /* AVFILTER_DESHAKE_KERNEL_H */
> +#endif /* AVFILTER_DESHAKE_OPENCL_KERNEL_H */

For internal consistency you should also rename the inclusion guard
name at the start of the file.

> 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 99%
> rename from libavfilter/unsharp_kernel.h
> rename to libavfilter/unsharp_opencl_kernel.h
> index dd65bc0..327f754 100644

> --- a/libavfilter/unsharp_kernel.h
> +++ b/libavfilter/unsharp_opencl_kernel.h
> @@ -134,4 +134,4 @@ kernel void unsharp(global  unsigned char *src,
>  
>  );
>  
> -#endif /* AVFILTER_UNSHARP_KERNEL_H */
> +#endif /* AVFILTER_UNSHARP_OPENCL_KERNEL_H */

same here.

LGTM otherwise, thanks.
-- 
FFmpeg = Fabulous Funny Mortal Philosophical Exuberant Gorilla