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
256 .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, \256 .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, \
257 .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \257 .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \
258 .wrapper_name = "v4l2m2m", \258 .wrapper_name = "v4l2m2m", \
259 };259 }
260 260
261M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb");261M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb");
262M2MDEC(hevc, "HEVC", AV_CODEC_ID_HEVC, "hevc_mp4toannexb");262M2MDEC(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
639 case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \639 case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \
640 } \640 } \
641}641}
642DEFINE_INIT_BLEND_FUNC(8, 8);642DEFINE_INIT_BLEND_FUNC(8, 8)
643DEFINE_INIT_BLEND_FUNC(9, 16);643DEFINE_INIT_BLEND_FUNC(9, 16)
644DEFINE_INIT_BLEND_FUNC(10, 16);644DEFINE_INIT_BLEND_FUNC(10, 16)
645DEFINE_INIT_BLEND_FUNC(12, 16);645DEFINE_INIT_BLEND_FUNC(12, 16)
646DEFINE_INIT_BLEND_FUNC(16, 16);646DEFINE_INIT_BLEND_FUNC(16, 16)
647 647
648void ff_blend_init(FilterParams *param, int depth)648void ff_blend_init(FilterParams *param, int depth)
649{649{
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
176 } \176 } \
177}177}
178 178
179conv_y_fn(uint8_t, 8);179conv_y_fn(uint8_t, 8)
180conv_y_fn(uint16_t, 10);180conv_y_fn(uint16_t, 10)
181 181
182static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) {182static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) {
183 dsp->convolution_x = convolution_x;183 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
37}37}
38 38
39#if HAVE_X86ASM39#if HAVE_X86ASM
40SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16);40SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16)
41#if HAVE_AVX2_EXTERNAL41#if HAVE_AVX2_EXTERNAL
42SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32);42SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32)
43#endif43#endif
44#endif44#endif
45 45

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