diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-10-07 02:10:30 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2019-10-07 21:15:55 +0200 |
| commit | 361fb42e1e53a78a96a8b30ed7c4baff18fa206e (patch) | |
| tree | a06273b1080628943cc75bfff617a02180965adb | |
| parent | 0633d87ae6e6a63669d0877aac5a12c22778b0e8 (diff) | |
| download | ffmpeg-361fb42e1e53a78a96a8b30ed7c4baff18fa206e.tar.gz | |
avcodec/filter: Remove extra '; ' outside of functions
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 <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavcodec/v4l2_m2m_dec.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_blend.c | 10 | ||||
| -rw-r--r-- | libavfilter/vf_vmafmotion.c | 4 | ||||
| -rw-r--r-- | 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 |