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>tags/n4.3
@@ -256,7 +256,7 @@ static const AVOption options[] = { | |||||
.capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, \ | .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, \ | ||||
.caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \ | .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \ | ||||
.wrapper_name = "v4l2m2m", \ | .wrapper_name = "v4l2m2m", \ | ||||
}; | |||||
} | |||||
M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb"); | M2MDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb"); | ||||
M2MDEC(hevc, "HEVC", AV_CODEC_ID_HEVC, "hevc_mp4toannexb"); | 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) | |||||
case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \ | 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) | void ff_blend_init(FilterParams *param, int depth) | ||||
{ | { | ||||
@@ -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) { | static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) { | ||||
dsp->convolution_x = convolution_x; | dsp->convolution_x = convolution_x; | ||||
@@ -37,9 +37,9 @@ static void FUNC_NAME(SCENE_SAD_PARAMS) { \ | |||||
} | } | ||||
#if HAVE_X86ASM | #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 | #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 | ||||
#endif | #endif | ||||