From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E50244973D for ; Sun, 18 Feb 2024 19:29:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 467AA68D39B; Sun, 18 Feb 2024 21:29:34 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2107.outbound.protection.outlook.com [40.92.90.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66D0B68D39B for ; Sun, 18 Feb 2024 21:29:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WVaAdpTfk4fmrcoRgcSr2TrTP3XYS7FpCCR6orRoMkh1P0ZUzjDzSiWQvxGcaVPfmSvZz81flL5TYlG3A8ZQzRz7NANHqhvUsdlGPUw7HyxcJlXR5GuPmsKScC6ti0sJMIJOnaTMOwW87Tl/gJzab+T7kuUxK8XWiu5Hgret7vpBuN4PULwe7V8ZS7LrIXCmk3ABkXGyTckXreoclc5XMz7Mw8TW3n6yGCpNF5MYFTK+5v4k8SjoPijJnl6IqJsOjnmd+UO6l2XCBCHLhVXmHDZnlynnggprkzBSCzQI75kGABukbxFvVbooHAxQlw+gx5ueGqGtp5Uyh6xGm671PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xdnwZzw6RJMMrRszX8cOPRZbEqs09vK5IarKMQUjTkI=; b=USf8/9XIb+K8zQ/pVK/e9qIOMGM8HQqBV66AQSHxktfEXX6lQdRUeBh8PgTuI8f8Atm0cKuT2ouUJbKXFhJ+38w5Oi29zqaZHLHVWwNX8xGzkC//GlZCwmfIXezJv0b5kilOdyaUMFyE5CJct752xg+Bvmj2vrRhj6a71ceN2/nllUjSqAU9XUp3LFgeJRSb73fG1xRP8OlCaSrdElsU6mNhZDqBvSTfyruWa5w7z1tVIoSVmvyXHviLGEhYZMRbnrjvLelw2v15wW9P5N4/Gjpii7LiFh6ttbYF52KXzzvUIPUv+KpegneOXz3Sun2pvUVBjaLmN5UJhUVkUdpT/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xdnwZzw6RJMMrRszX8cOPRZbEqs09vK5IarKMQUjTkI=; b=McyPS2ekzcYoOVdbOZMzU1JUJ/uJTQQ+Y3BWt0xcEWfcJw2i6/aEEEVGP2iE48jEG4nWIYmibkbWRS9xvWQ9hMcAN4Zjyfi7Yt7vPnCISRg/zBxWpuhlQ3byj8tvl2J1+P2Ps8en/YioQdrXLyofVTmz5v1KSNNqWiwALffkY1eqoQ3Ms1vGPt9uJuvRqFzu6SC3F4ibMhtZGJXsaGc19LZNgMM9ReY+zyz4bCeaNbbcBj+DvhbvUvsz4GhgwO4U2jl54a0H3nAJ2/RxaPizhvH4RtAziULXJMe1SEtzMQ9BmeTPOLh49KZnOb11ycYQ6QmxL8H+Omrysx7nL462gA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0405.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4ad::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.37; Sun, 18 Feb 2024 19:29:18 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Sun, 18 Feb 2024 19:29:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 20:31:06 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [OHWWZmoZBKngpfMLEwQahTMjvMLWM1LzmK9GfjbM4h0=] X-ClientProxiedBy: ZR0P278CA0209.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::26) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240218193106.346214-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0405:EE_ X-MS-Office365-Filtering-Correlation-Id: 95e91b49-858a-411a-8c8a-08dc30b7e5e5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EDObaLQzQ5lAB3MbjYXbV4KFgFvJOAQ07EO2U9BWZVYnBSu6OZT7yuS7GfHkPLEMJqj+u9l50tJBPz5MWpOcM4fbN+xmLRYCXLDVC77K0ZS9kUvpVdLdtBqUVg+j9NfvnyPuYiLMInQ2+R3fpEEkgiPhzAQs3H/kN16KFfVSiCJX3GpICz/oBFXO41r7Mwx8VWpgFNbgXCfo82zSoA6bWSgQ8Qjyso8O8EvVOJFuhcdSEdjItvMNpf7pwFk8weK+lj4NNlDCTMFj0kWNzRWly0weZFXJw0NSL1hFKjuKRmycDZHGOkfHqLvWxaNuXerxGBVrDy/QW6Bd3g75JQnERk5dhcFE0ZbvvssXjh5wr4yMXg6owuzOLuagnKdNuMhZI6TEOmeAz4WijJMpiYjPsmHhnBr6nu7w7s76W+3ODs+1AlAKN4FirXsAEAlZ/6OKg2qFkJZrWzo1lSPeWC66DkdCRGK/Mdd6A8lNgQyQTdnWHwIRawV3W/nSJON5HA7hEYTlJpTdq1ad4IbH4YAptVkUHqGQdUbOzoSYMDmKTcIQ773H7FrD3CwlTDOCSIyQhchB8IagxnCOR2is+ENKzoK90AjxPm/UkWtz2DFi6XVIavUT0l/JT6Cw14yvU2R2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?m6IllIE5ikSeu5kf5EJy3HSXkYaF28ilIz5Dqt56Bzs171wSdSI6/cHapkjt?= =?us-ascii?Q?4MuQReGGp551BScayWcYxcDTZxS9zF+lQAp9AWyf+HQIrIJCwLvWKEuZyjjx?= =?us-ascii?Q?hIxPyyqfbn6V7ZKgFkXXibw1PR1NCBQUEjn377g4DXMqh12MmX9DsHyeFFGU?= =?us-ascii?Q?9IJM6QO3K0FVKnozsfIfS+kUIYshD6BdYt0rAWMrKR/wx8evRReJIhsTOxgK?= =?us-ascii?Q?6dKii/t/2M0tRK+Bv8yhZcYNkKvW9yJECHJLvW0bsvAaCwPale+YcYda/dw2?= =?us-ascii?Q?RzjjY1I67vvmmZtC4FjVpunn/EQxIbcCzPhp+8R0e3ygPHXKXpG0WyRzfm4u?= =?us-ascii?Q?la9WZyrLLUWdmiG3jIgfEN7cGsA1WQtWQ/ifwjp+Sm2mBLwN76q6S1HoADbb?= =?us-ascii?Q?C7JfDkctywq4aWl4dGlPG03CfLbkJLyMXW3hgYjX6QojmHeZyo6b/298QF4c?= =?us-ascii?Q?8pRWrGVZPx5R+jraQRTOybDLmLS6v7aycVpYRNnsdFILuB+5Nav6cjqt6CJ0?= =?us-ascii?Q?hl8P8FSVBvBZsPB42WWk0wRAzmXQQnobb8LSZsvHzznwrNyvpsyFjQFsnt9k?= =?us-ascii?Q?Q65VKXm7TScK7Pytc7eLL2sm6ymbtM9hZe2Ifu2TePEt1ZpGahwa/R+5J4SJ?= =?us-ascii?Q?s0oiRoOnJ0FnsZrTUi/bLEOEqq3rvqQ5gkz+rynp1EV4XacgU9RqTHfcCHaw?= =?us-ascii?Q?lFD3oCeBaULnUvUX8tWOu8AJXqv390l48/Z4I5RwHi+z+c2/T6Wb47b0GT2n?= =?us-ascii?Q?Zh4cBTN7FFqm3//UjEJRAkffgvXBh2f96l7UebZwC+oxbAHxuaRtAtMBmDNm?= =?us-ascii?Q?sTk/VoTua7N5nzPm5HKO7PauIk1Las/YDAs9uK6AEI+L6P1IQo97UvQPInSL?= =?us-ascii?Q?PZmMgDcpx50D+YiUPzhJEcpBCRiWUkRz7nQsLq5N14vbzJPc02DZToYm1O9J?= =?us-ascii?Q?sHGbs/6ODzeJ8koVEz9sqxog9AzxBPp1Ya0Sh2M9LArOIKjbyP2Ct80vShbI?= =?us-ascii?Q?3S/noPXF9Iq9/yj31KyMOfc4Dee4h0rLdWsncq5gvOJlDkpLb2T6bLcyKTb1?= =?us-ascii?Q?BuQX5/N8IPGTOHwaahO905r9tfmJbxDJTsnDZA2AzBhzeYPh5OPjF8oHuj79?= =?us-ascii?Q?UNRr6uag+ZH0jXrkKmMtjM6fxfxcnsFf6gQwxB6w3pp1rksBQUQDSgOzgTPJ?= =?us-ascii?Q?SVf/gsgcZzjvzTFTIHkeKd39ANJYCZWL1Ib+/zfD2oyrhe3KgL1cw2sr4pSx?= =?us-ascii?Q?8nG9isd+jgir3eyoHPKQQxp7oh0uo1Kighi0RcPkhQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95e91b49-858a-411a-8c8a-08dc30b7e5e5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2024 19:29:17.5598 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1P250MB0405 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec: Remove superfluous '; ' outside of functions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Inside a function an extra ';' is a null statement; but outside of it it simply must not happen. So remove them. 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; \ -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".