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.
Unified · Split
| @@ -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 | ||
| 261 | M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb"); | 261 | M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb"); |
| 262 | M2MDEC(hevc, "HEVC", AV_CODEC_ID_HEVC, "hevc_mp4toannexb"); | 262 | M2MDEC(hevc, "HEVC", AV_CODEC_ID_HEVC, "hevc_mp4toannexb"); |
| @@ -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 | } |
| 642 | DEFINE_INIT_BLEND_FUNC(8, 8); | 642 | DEFINE_INIT_BLEND_FUNC(8, 8) |
| 643 | DEFINE_INIT_BLEND_FUNC(9, 16); | 643 | DEFINE_INIT_BLEND_FUNC(9, 16) |
| 644 | DEFINE_INIT_BLEND_FUNC(10, 16); | 644 | DEFINE_INIT_BLEND_FUNC(10, 16) |
| 645 | DEFINE_INIT_BLEND_FUNC(12, 16); | 645 | DEFINE_INIT_BLEND_FUNC(12, 16) |
| 646 | DEFINE_INIT_BLEND_FUNC(16, 16); | 646 | DEFINE_INIT_BLEND_FUNC(16, 16) |
| 647 | 647 | ||
| 648 | void ff_blend_init(FilterParams *param, int depth) | 648 | void ff_blend_init(FilterParams *param, int depth) |
| 649 | { | 649 | { |
| @@ -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 | ||
| 179 | conv_y_fn(uint8_t, 8); | 179 | conv_y_fn(uint8_t, 8) |
| 180 | conv_y_fn(uint16_t, 10); | 180 | conv_y_fn(uint16_t, 10) |
| 181 | 181 | ||
| 182 | static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) { | 182 | static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) { |
| 183 | dsp->convolution_x = convolution_x; | 183 | dsp->convolution_x = convolution_x; |
| @@ -37,9 +37,9 @@ static void FUNC_NAME(SCENE_SAD_PARAMS) { \ · 36 unmodified lines | |||
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | #if HAVE_X86ASM | 39 | #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) |
| 41 | #if HAVE_AVX2_EXTERNAL | 41 | #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) |
| 43 | #endif | 43 | #endif |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||