From 39b4b5aad7f5603e8222163b6fd347ce61aeecbe Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 18 Feb 2024 19:35:23 +0100 Subject: [PATCH] avcodec: Remove superfluous ';' outside of functions Inside a function an extra ';' is a null statement; but outside of it it simply must not happen. So remove them. Reviewed-by: Nuo Mi Signed-off-by: Andreas Rheinhardt --- libavcodec/vvc/vvc_itx_1d.c | 2 +- libavcodec/x86/h26x/h2656dsp.h | 2 +- libavcodec/x86/hevcdsp_init.c | 78 ++++++++++++++++---------------- libavcodec/x86/vvc/vvcdsp_init.c | 24 +++++----- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/libavcodec/vvc/vvc_itx_1d.c b/libavcodec/vvc/vvc_itx_1d.c index 01a50aad25..cb076f680f 100644 --- a/libavcodec/vvc/vvc_itx_1d.c +++ b/libavcodec/vvc/vvc_itx_1d.c @@ -639,7 +639,7 @@ void ff_vvc_inv_dct2_64(int *coeffs, const ptrdiff_t stride, const size_t nz) coeffs[61 * stride] = E[2] - O[2]; coeffs[62 * stride] = E[1] - O[1]; coeffs[63 * stride] = E[0] - O[0]; -}; +} static void matrix_mul(int *coeffs, const ptrdiff_t stride, const int8_t* matrix, const int size, const size_t nz) { diff --git a/libavcodec/x86/h26x/h2656dsp.h b/libavcodec/x86/h26x/h2656dsp.h index e31aae6b0d..0ea08b6a20 100644 --- a/libavcodec/x86/h26x/h2656dsp.h +++ b/libavcodec/x86/h26x/h2656dsp.h @@ -31,7 +31,7 @@ #define H2656_PEL_PROTOTYPE(name, D, opt) \ void ff_h2656_put_ ## name ## _ ## D ## _##opt(int16_t *dst, ptrdiff_t dststride, const uint8_t *_src, ptrdiff_t _srcstride, int height, const int8_t *hf, const int8_t *vf, int width); \ -void ff_h2656_put_uni_ ## name ## _ ## D ## _##opt(uint8_t *_dst, ptrdiff_t _dststride, const uint8_t *_src, ptrdiff_t _srcstride, int height, const int8_t *hf, const int8_t *vf, int width); \ +void ff_h2656_put_uni_ ## name ## _ ## D ## _##opt(uint8_t *_dst, ptrdiff_t _dststride, const uint8_t *_src, ptrdiff_t _srcstride, int height, const int8_t *hf, const int8_t *vf, int width) \ #define H2656_MC_8TAP_PROTOTYPES(fname, bitd, opt) \ H2656_PEL_PROTOTYPE(fname##4, bitd, opt); \ diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index 3d4e41754d..f5bc342cd5 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -123,17 +123,17 @@ void ff_hevc_put_hevc_uni_ ## a ## _ ## depth ## _##opt(uint8_t *dst, ptrdiff_t #define FW_DIR_HV(npel, n, w, depth, opt) \ FW_PUT_FUNCS(npel, npel ## _hv##w, n ## tap_hv##w, depth, opt) -FW_PEL(4, 8, sse4); -FW_PEL(6, 8, sse4); -FW_PEL(8, 8, sse4); -FW_PEL(12, 8, sse4); -FW_PEL(16, 8, sse4); -FW_PEL(4, 10, sse4); -FW_PEL(6, 10, sse4); -FW_PEL(8, 10, sse4); -FW_PEL(4, 12, sse4); -FW_PEL(6, 12, sse4); -FW_PEL(8, 12, sse4); +FW_PEL(4, 8, sse4) +FW_PEL(6, 8, sse4) +FW_PEL(8, 8, sse4) +FW_PEL(12, 8, sse4) +FW_PEL(16, 8, sse4) +FW_PEL(4, 10, sse4) +FW_PEL(6, 10, sse4) +FW_PEL(8, 10, sse4) +FW_PEL(4, 12, sse4) +FW_PEL(6, 12, sse4) +FW_PEL(8, 12, sse4) #define FW_EPEL(w, depth, opt) FW_DIR(epel, 4, w, depth, opt) #define FW_EPEL_HV(w, depth, opt) FW_DIR_HV(epel, 4, w, depth, opt) @@ -141,18 +141,18 @@ FW_PEL(8, 12, sse4); FW_EPEL(w, depth, opt) \ FW_EPEL_HV(w, depth, opt) -FW_EPEL(12, 8, sse4); +FW_EPEL(12, 8, sse4) -FW_EPEL_FUNCS(4, 8, sse4); -FW_EPEL_FUNCS(6, 8, sse4); -FW_EPEL_FUNCS(8, 8, sse4); -FW_EPEL_FUNCS(16, 8, sse4); -FW_EPEL_FUNCS(4, 10, sse4); -FW_EPEL_FUNCS(6, 10, sse4); -FW_EPEL_FUNCS(8, 10, sse4); -FW_EPEL_FUNCS(4, 12, sse4); -FW_EPEL_FUNCS(6, 12, sse4); -FW_EPEL_FUNCS(8, 12, sse4); +FW_EPEL_FUNCS(4, 8, sse4) +FW_EPEL_FUNCS(6, 8, sse4) +FW_EPEL_FUNCS(8, 8, sse4) +FW_EPEL_FUNCS(16, 8, sse4) +FW_EPEL_FUNCS(4, 10, sse4) +FW_EPEL_FUNCS(6, 10, sse4) +FW_EPEL_FUNCS(8, 10, sse4) +FW_EPEL_FUNCS(4, 12, sse4) +FW_EPEL_FUNCS(6, 12, sse4) +FW_EPEL_FUNCS(8, 12, sse4) #define FW_QPEL(w, depth, opt) FW_DIR(qpel, 8, w, depth, opt) #define FW_QPEL_HV(w, depth, opt) FW_DIR_HV(qpel, 8, w, depth, opt) @@ -160,31 +160,31 @@ FW_EPEL_FUNCS(8, 12, sse4); FW_QPEL(w, depth, opt) \ FW_QPEL_HV(w, depth, opt) -FW_QPEL(12, 8, sse4); -FW_QPEL(16, 8, sse4); +FW_QPEL(12, 8, sse4) +FW_QPEL(16, 8, sse4) -FW_QPEL_FUNCS(4, 8, sse4); -FW_QPEL_FUNCS(8, 8, sse4); -FW_QPEL_FUNCS(4, 10, sse4); -FW_QPEL_FUNCS(8, 10, sse4); -FW_QPEL_FUNCS(4, 12, sse4); -FW_QPEL_FUNCS(8, 12, sse4); +FW_QPEL_FUNCS(4, 8, sse4) +FW_QPEL_FUNCS(8, 8, sse4) +FW_QPEL_FUNCS(4, 10, sse4) +FW_QPEL_FUNCS(8, 10, sse4) +FW_QPEL_FUNCS(4, 12, sse4) +FW_QPEL_FUNCS(8, 12, sse4) #if HAVE_AVX2_EXTERNAL -FW_PEL(32, 8, avx2); -FW_PUT(pel, pel_pixels16, pixels16, 10, avx2); +FW_PEL(32, 8, avx2) +FW_PUT(pel, pel_pixels16, pixels16, 10, avx2) -FW_EPEL(32, 8, avx2); -FW_EPEL(16, 10, avx2); +FW_EPEL(32, 8, avx2) +FW_EPEL(16, 10, avx2) -FW_EPEL_HV(32, 8, avx2); -FW_EPEL_HV(16, 10, avx2); +FW_EPEL_HV(32, 8, avx2) +FW_EPEL_HV(16, 10, avx2) -FW_QPEL(32, 8, avx2); -FW_QPEL(16, 10, avx2); +FW_QPEL(32, 8, avx2) +FW_QPEL(16, 10, avx2) -FW_QPEL_HV(16, 10, avx2); +FW_QPEL_HV(16, 10, avx2) #endif #endif diff --git a/libavcodec/x86/vvc/vvcdsp_init.c b/libavcodec/x86/vvc/vvcdsp_init.c index 8ee4074350..0d2c683f0f 100644 --- a/libavcodec/x86/vvc/vvcdsp_init.c +++ b/libavcodec/x86/vvc/vvcdsp_init.c @@ -40,12 +40,12 @@ static void ff_vvc_put_ ## name ## _ ## depth ## _##opt(int16_t *dst, const uint } #define FW_PUT_TAP(fname, bitd, opt ) \ - FW_PUT(fname##4, bitd, opt ); \ - FW_PUT(fname##8, bitd, opt ); \ - FW_PUT(fname##16, bitd, opt ); \ - FW_PUT(fname##32, bitd, opt ); \ - FW_PUT(fname##64, bitd, opt ); \ - FW_PUT(fname##128, bitd, opt ); \ + FW_PUT(fname##4, bitd, opt ) \ + FW_PUT(fname##8, bitd, opt ) \ + FW_PUT(fname##16, bitd, opt ) \ + FW_PUT(fname##32, bitd, opt ) \ + FW_PUT(fname##64, bitd, opt ) \ + FW_PUT(fname##128, bitd, opt ) \ #define FW_PUT_4TAP(fname, bitd, opt) \ FW_PUT(fname ## 2, bitd, opt) \ @@ -66,9 +66,9 @@ static void ff_vvc_put_ ## name ## _ ## depth ## _##opt(int16_t *dst, const uint FW_PUT_4TAP_SSE4(bitd) \ FW_PUT_8TAP_SSE4(bitd) -FW_PUT_SSE4( 8); -FW_PUT_SSE4(10); -FW_PUT_SSE4(12); +FW_PUT_SSE4( 8) +FW_PUT_SSE4(10) +FW_PUT_SSE4(12) #define FW_PUT_TAP_AVX2(n, bitd) \ FW_PUT(n ## tap_h32, bitd, avx2) \ @@ -100,10 +100,10 @@ FW_PUT_AVX2(12) #define FW_PUT_16BPC_AVX2(bitd) \ FW_PUT(pixels16, bitd, avx2) \ FW_PUT_TAP_16BPC_AVX2(4, bitd) \ - FW_PUT_TAP_16BPC_AVX2(8, bitd); + FW_PUT_TAP_16BPC_AVX2(8, bitd) -FW_PUT_16BPC_AVX2(10); -FW_PUT_16BPC_AVX2(12); +FW_PUT_16BPC_AVX2(10) +FW_PUT_16BPC_AVX2(12) #define PEL_LINK(dst, C, W, idx1, idx2, name, D, opt) \ dst[C][W][idx1][idx2] = ff_vvc_put_## name ## _ ## D ## _##opt; \