History

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.

Andreas Rheinhardt committed 7 years ago

Commit 361fb421 parent 0633d874 files · +10 −10Browse files

Unified · Split

4 files
  1. libavcodec/v4l2_m2m_dec.c +1 −1
  2. libavfilter/vf_blend.c +5 −5
  3. libavfilter/vf_vmafmotion.c +2 −2
  4. libavfilter/x86/scene_sad_init.c +2 −2
libavcodec/v4l2_m2m_dec.c+1−1
@@ -256,7 +256,7 @@ static const AVOption options[] = { · 255 unmodified lines
256256 .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, \
257257 .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \
258258 .wrapper_name = "v4l2m2m", \
259− };
259+ }
260260
261261 M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb");
262262 M2MDEC(hevc, "HEVC", AV_CODEC_ID_HEVC, "hevc_mp4toannexb");
libavfilter/vf_blend.c+5−5
@@ -639,11 +639,11 @@ static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) · 638 unmodified lines
639639 case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \
640640 } \
641641 }
642−DEFINE_INIT_BLEND_FUNC(8, 8);
643−DEFINE_INIT_BLEND_FUNC(9, 16);
644−DEFINE_INIT_BLEND_FUNC(10, 16);
645−DEFINE_INIT_BLEND_FUNC(12, 16);
646−DEFINE_INIT_BLEND_FUNC(16, 16);
642+DEFINE_INIT_BLEND_FUNC(8, 8)
643+DEFINE_INIT_BLEND_FUNC(9, 16)
644+DEFINE_INIT_BLEND_FUNC(10, 16)
645+DEFINE_INIT_BLEND_FUNC(12, 16)
646+DEFINE_INIT_BLEND_FUNC(16, 16)
647647
648648 void ff_blend_init(FilterParams *param, int depth)
649649 {
libavfilter/vf_vmafmotion.c+2−2
@@ -176,8 +176,8 @@ static void convolution_y_##bits##bit(const uint16_t *filter, int filt_w, \ · 175 unmodified lines
176176 } \
177177 }
178178
179−conv_y_fn(uint8_t, 8);
180−conv_y_fn(uint16_t, 10);
179+conv_y_fn(uint8_t, 8)
180+conv_y_fn(uint16_t, 10)
181181
182182 static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) {
183183 dsp->convolution_x = convolution_x;
libavfilter/x86/scene_sad_init.c+2−2
@@ -37,9 +37,9 @@ static void FUNC_NAME(SCENE_SAD_PARAMS) { \ · 36 unmodified lines
3737 }
3838
3939 #if HAVE_X86ASM
40−SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16);
40+SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16)
4141 #if HAVE_AVX2_EXTERNAL
42−SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32);
42+SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32)
4343 #endif
4444 #endif
4545

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t