Re: [FFmpeg-devel] [PATCH] avcodec/filter: Remove extra '; ' outside of functions

2019-10-07 Thread Paul B Mahol 
applied

On 10/7/19, Paul B Mahol  wrote:
> ok
>
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/filter: Remove extra '; ' outside of functions

2019-10-07 Thread Paul B Mahol 
ok

On 10/7/19, Andreas Rheinhardt  wrote:
> They are not allowed outside of functions. Fixes the warning
> "ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]"
> when compiling with GCC and -pedantic.
>
> Signed-off-by: Andreas Rheinhardt 
> ---
>  libavcodec/v4l2_m2m_dec.c|  2 +-
>  libavfilter/vf_blend.c   | 10 +-
>  libavfilter/vf_vmafmotion.c  |  4 ++--
>  libavfilter/x86/scene_sad_init.c |  4 ++--
>  4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
> index 0c3fa3a7be..4712aca34c 100644
> --- a/libavcodec/v4l2_m2m_dec.c
> +++ b/libavcodec/v4l2_m2m_dec.c
> @@ -256,7 +256,7 @@ static const AVOption options[] = {
>  .capabilities   = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY |
> AV_CODEC_CAP_AVOID_PROBING, \
>  .caps_internal  = FF_CODEC_CAP_SETS_PKT_DTS, \
>  .wrapper_name   = "v4l2m2m", \
> -};
> +}
>
>  M2MDEC(h264,  "H.264", AV_CODEC_ID_H264,   "h264_mp4toannexb");
>  M2MDEC(hevc,  "HEVC",  AV_CODEC_ID_HEVC,   "hevc_mp4toannexb");
> diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
> index d6036c10e2..67163be3e7 100644
> --- a/libavfilter/vf_blend.c
> +++ b/libavfilter/vf_blend.c
> @@ -639,11 +639,11 @@ static av_cold void
> init_blend_func_##depth##_##nbits##bit(FilterParams *param)
>  case BLEND_XOR:param->blend = blend_xor_##depth##bit;
>  break;   \
>  }
>   \
>  }
> -DEFINE_INIT_BLEND_FUNC(8, 8);
> -DEFINE_INIT_BLEND_FUNC(9, 16);
> -DEFINE_INIT_BLEND_FUNC(10, 16);
> -DEFINE_INIT_BLEND_FUNC(12, 16);
> -DEFINE_INIT_BLEND_FUNC(16, 16);
> +DEFINE_INIT_BLEND_FUNC(8, 8)
> +DEFINE_INIT_BLEND_FUNC(9, 16)
> +DEFINE_INIT_BLEND_FUNC(10, 16)
> +DEFINE_INIT_BLEND_FUNC(12, 16)
> +DEFINE_INIT_BLEND_FUNC(16, 16)
>
>  void ff_blend_init(FilterParams *param, int depth)
>  {
> diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c
> index 5c2a974538..88d0b35095 100644
> --- a/libavfilter/vf_vmafmotion.c
> +++ b/libavfilter/vf_vmafmotion.c
> @@ -176,8 +176,8 @@ static void convolution_y_##bits##bit(const uint16_t
> *filter, int filt_w, \
>  } \
>  }
>
> -conv_y_fn(uint8_t, 8);
> -conv_y_fn(uint16_t, 10);
> +conv_y_fn(uint8_t, 8)
> +conv_y_fn(uint16_t, 10)
>
>  static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) {
>  dsp->convolution_x = convolution_x;
> diff --git a/libavfilter/x86/scene_sad_init.c
> b/libavfilter/x86/scene_sad_init.c
> index f8104dcb4f..2c3729ceee 100644
> --- a/libavfilter/x86/scene_sad_init.c
> +++ b/libavfilter/x86/scene_sad_init.c
> @@ -37,9 +37,9 @@ static void FUNC_NAME(SCENE_SAD_PARAMS) {
>\
>  }
>
>  #if HAVE_X86ASM
> -SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16);
> +SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16)
>  #if HAVE_AVX2_EXTERNAL
> -SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32);
> +SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32)
>  #endif
>  #endif
>
> --
> 2.20.1
>
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH] avcodec/filter: Remove extra '; ' outside of functions

2019-10-06 Thread Andreas Rheinhardt 
They are not allowed outside of functions. Fixes the warning
"ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]"
when compiling with GCC and -pedantic.

Signed-off-by: Andreas Rheinhardt 
---
 libavcodec/v4l2_m2m_dec.c|  2 +-
 libavfilter/vf_blend.c   | 10 +-
 libavfilter/vf_vmafmotion.c  |  4 ++--
 libavfilter/x86/scene_sad_init.c |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
index 0c3fa3a7be..4712aca34c 100644
--- a/libavcodec/v4l2_m2m_dec.c
+++ b/libavcodec/v4l2_m2m_dec.c
@@ -256,7 +256,7 @@ static const AVOption options[] = {
 .capabilities   = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | 
AV_CODEC_CAP_AVOID_PROBING, \
 .caps_internal  = FF_CODEC_CAP_SETS_PKT_DTS, \
 .wrapper_name   = "v4l2m2m", \
-};
+}
 
 M2MDEC(h264,  "H.264", AV_CODEC_ID_H264,   "h264_mp4toannexb");
 M2MDEC(hevc,  "HEVC",  AV_CODEC_ID_HEVC,   "hevc_mp4toannexb");
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index d6036c10e2..67163be3e7 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -639,11 +639,11 @@ static av_cold void 
init_blend_func_##depth##_##nbits##bit(FilterParams *param)
 case BLEND_XOR:param->blend = blend_xor_##depth##bit;
break;   \
 }  
   \
 }
-DEFINE_INIT_BLEND_FUNC(8, 8);
-DEFINE_INIT_BLEND_FUNC(9, 16);
-DEFINE_INIT_BLEND_FUNC(10, 16);
-DEFINE_INIT_BLEND_FUNC(12, 16);
-DEFINE_INIT_BLEND_FUNC(16, 16);
+DEFINE_INIT_BLEND_FUNC(8, 8)
+DEFINE_INIT_BLEND_FUNC(9, 16)
+DEFINE_INIT_BLEND_FUNC(10, 16)
+DEFINE_INIT_BLEND_FUNC(12, 16)
+DEFINE_INIT_BLEND_FUNC(16, 16)
 
 void ff_blend_init(FilterParams *param, int depth)
 {
diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c
index 5c2a974538..88d0b35095 100644
--- a/libavfilter/vf_vmafmotion.c
+++ b/libavfilter/vf_vmafmotion.c
@@ -176,8 +176,8 @@ static void convolution_y_##bits##bit(const uint16_t 
*filter, int filt_w, \
 } \
 }
 
-conv_y_fn(uint8_t, 8);
-conv_y_fn(uint16_t, 10);
+conv_y_fn(uint8_t, 8)
+conv_y_fn(uint16_t, 10)
 
 static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) {
 dsp->convolution_x = convolution_x;
diff --git a/libavfilter/x86/scene_sad_init.c b/libavfilter/x86/scene_sad_init.c
index f8104dcb4f..2c3729ceee 100644
--- a/libavfilter/x86/scene_sad_init.c
+++ b/libavfilter/x86/scene_sad_init.c
@@ -37,9 +37,9 @@ static void FUNC_NAME(SCENE_SAD_PARAMS) { 
\
 }
 
 #if HAVE_X86ASM
-SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16);
+SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16)
 #if HAVE_AVX2_EXTERNAL
-SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32);
+SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32)
 #endif
 #endif
 
-- 
2.20.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".