From patchwork Fri Jan 21 21:26:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp830981iog; Fri, 21 Jan 2022 13:27:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlkMsWFsZsSDem1HB6mo6Nr10u6EpyFFxLB5b7spWjsHM8ZXapaGsva8ekBVxwofvR5pQd X-Received: by 2002:aa7:cd9a:: with SMTP id x26mr5866240edv.159.1642800424424; Fri, 21 Jan 2022 13:27:04 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g9si4277267edj.280.2022.01.21.13.27.03; Fri, 21 Jan 2022 13:27:04 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=F71IpJVB; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1392468B13E; Fri, 21 Jan 2022 23:27:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069026.outbound.protection.outlook.com [40.92.69.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82DE368B109 for ; Fri, 21 Jan 2022 23:26:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWvp3Kh23wfqIyQpA6tJMS7F9H1HJW/hnnsSqhHO2egh5csweA24azr0xwj1axk4fPXGlm+REOUZ1mZ/M0+0oPQTPdEx3a46cFB/p0kwqE5HUALNUH8MOLapWgJaI4cc80NwprXK4TOluAnOgFFYu/fpLn+Y2HCde/cNvRlKbv2EJ09yrKKH90VXvOcGe7pQRHcHjO3tz+BFzlH4Te4i1yBdqK98UyqZYOVq6L6Qfn8UA0kxfY3uAAUBVlqoC5aIlyBCgfit4hf9xx0fgecBGeUr9aJ50AmZwXecIqS7+IDwFecCJZ0ISsCR2LB1EZtMRlo6QO4PYpXM7EIAFMYbjQ== 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=Wx1poFnd1x5vsc5GrTFTKQzSKcWSVV+j9Sq8o+8zkbY=; b=YfcqG6maYXAivyssJSwWUneXtYXd1dA5IIFv17tGMEAj3SGjGUHpqs3oDPAKbL8//TOluz7Sli9fpwo6+Jm1AatdTlyv7tkDbvNsmX6mvlzsG0CSYWc+j6b8OzOc2WM1ahjDb4jq6lMBN3vcSQ0Qba9b9ck8bk+OMgm1aHsYq/0kHyljrQgkVQy/+/d3Ajk/H9pgCbFQ+H6oC4U7haJEW1YFfLfzU5wYCdt5pWbTQMHFBqOVhf74jpTAaCNWQTxQBsx76GDw0JkbavU3zFOUSzQ1Uhz4irnuE4bWscqvfyoVEkHgOksmhurPlo6XcYQHM/IevWi/lrziZ7nWcnvwBg== 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=Wx1poFnd1x5vsc5GrTFTKQzSKcWSVV+j9Sq8o+8zkbY=; b=F71IpJVByzEqBEbg0dYgQ8QP9my2SzizI4K7ab2J3kl7BiGAFKUMPh7KC0349/6IVc7AKKwC1qJ481oDlsHOhG/XEGKazZ3IxrLOBOLXZm2sX5HaNMqu8Mq25XBPi5voUvIV4F/x9Nd/zHnWk9BjmgJOaqTgbGiefVOfCE9nfcN/l+QxqtVGjO0DEgc114mufFI/yKkb6bvIu01sMu2AuBsEP82ZOYG6DK0Z9UmUPf/oO2Gtp3XDqiVWpN7tqc26lzq5W7cnE3elIKwiT5mYKhHNaGd1pStlhn9EeLg/ODaiIoxwG99sDXpoIXz93C7Qib6EOw6DuQWyGrDHw6gKUw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0301MB6670.eurprd03.prod.outlook.com (2603:10a6:800:17c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Fri, 21 Jan 2022 21:26:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4909.008; Fri, 21 Jan 2022 21:26:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jan 2022 22:26:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [/FnLp9K95FQ4FpEJZjYV8laPpVDZLRmo] X-ClientProxiedBy: AM0PR10CA0075.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220121212643.1595394-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5818d75a-90af-4f51-de1a-08d9dd24bcda X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSV0TCwkppgUFRWy0piiKpMgIVFRJhOKo3QqtiegNEQ/NyaayHoPX5VHacLKSlHld4eRQP0arjmiUzorrL/rOCkev7cbjnR2j5nqnDDQMrvqrd7zSgrXw/N49Kq/0eDBnCdcoySRxpGM/gVDLIDu/7Pqiak0x1VknxHjEkT75Z9qJ7a3X1n/XzpIT47kgK+XnHsGMqPc2M5n/CWXmpcIDHr2UPVKlAtGLoV0lYO3eMZ2s4kcfPpMWnEzvLFFgn+buninuUVcu300drvIcLft3YpCSAqXtVcNQbWUr8nxvo6JZOMsg/BbujUslRbhOSNml41pFLOI+IsyBBB9URvQhMkF0vsjaqttgwEIHkLtL3zE2cuGq63RrplThBAQB6KTnn2gEc4S9Yz7I+Pu2sZY0lB3IpUvwZ0+ZFQwg4PvNbbu8ssV1e7ONCd+ggxmG3epk8BYz0VTARSyM2f5hIgagSC5x5QGaUUNOFmB1SNa7GtM8d2N2NfZAfsbj+TpgOT4pX9CHco93M8o5byft8w4HfMAP3LBKBLBBNpbIxDiaiHbbvCtrjRSkQi0TUbTbV76jcLZoHAbRn80k7FTxOlqMrGWDfhq8pP3UVe/Ga9lIgC3s3+m9T9jK3rrU3/KF4LQ0ApLmwq+bT9zeypTz9hTACtcbfdxng63vW5bAN44tz03Wdh+9N5dNxEvygRtl6hp46AM3Kp+W+v82RIgS+YxEQXTh9rdIBy+bjfm9Np0VBu2faNz3ih+6efUiBzDi31QJQ= X-MS-TrafficTypeDiagnostic: VI1PR0301MB6670:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aRHkSDV5fDpO/rgyYPjTqGF0qQk35fDy9HOH6jS8w2Vib5a4lNg70P017FBlxhnSIVliVsd8muMggzuo5xBZuEabqMx5tuPlU/Un9pCXS4CWHdYdaR3fif6sH6p4UGC5KwndRYVt6YG0tYJcxhM1+cieDkj7TtyV72EUCvEryNYNlP8acDXs8YGttcIBIRTUTQmRrDFcyHfW5IxmXgnW29kRS0smjC/5M65alsJe3+Cp7Lt6FEPuAbVaSL8+MmeuPAPkpjSg4hFwDeVnthOunfsyvrFSTWWMqy6hqwXJXKjJTn0ybrfCfCQmIHawfj9BzIKKtLMfmnEC9pebqTWjaz9BFbYGaA4pr6vXiSJq8VW9Rxc8DeOhUyRy4NzVgqaMUUR98CKMlRiEECOHwUrIRe1ZPgpfurXnBZq5ts0pN20fq0UjKWjgxoDMv+cCZORqv6jd5r7JYH83xwHtwUjM9V33hUYRWT4Va0bVyVus8rvgaVC6S7YaGyz48I4gCW3k7aTPk9dKvGWLhYUIUqqRT4bpSEo8d0jm580+36pxQB1ZNfhk25w5A6I6o6WViBIloTtfxmV0vYPrpcG+fLVZmw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s5ZEVI3+0lxoyOc+9Bb1ixVTRUH60Py1L9gMEuMr1mbavpLV1A/HEYDdKWN15yedsvxxFvlN7mQiB4yoPJs7ONh3N7pIYCvIrj+yZfs1ge+6/Eyr88vuyJ29PA5l5bbSrC98mKJIqCIQFmd1bCL4uUtKm/UelElTTM9VKISvx9h9zg7x5uXEKz09mDU3DyV0/hZTeGLqP657002slO55NIyVM0N5QukkltpUxvsQaaD1eFyz7Vxcq3Evx+ZEe5KP44eG7qzZT9RW4YHa/WWq6GEPFN5saabqWcaNyu5UwidDAGvEF7vOfTB++1fke27rWFx1ZNKNxuBPEX3s1A2TpEuIWx6WUJQ5DBrvueW1zeS8QuTTpnOFiaOv+LWMT8eZ+s6fAWpJ17XOAziwv6Xoo623/inxEqQez2QY/e0fHzGJSOlZS48FS2sZNrTpgLZZFNpOeNeegy/sgctayupJqXs652zqQfjiUb/KWxnGprfPIjTULq6l4aPtOD602OSmoyz9JSVUJKmsH2q/r3lXQXVcK3mjN1ndpZIFKr+HUE/PcfWpSc/ZD3KWDVuszKKK3WLrC/MgEUHqwqfbcwJzwI7zteNkyLM1MWOS1P7/BOHfE+OWCMnDthJgmp5XAjM/tnEtuyoANrA4suVxGUw0Ata2c9D+/fH3FszQvZIH9OVQMmPfN13D9h5W3uBUPGUgAB9JoO2TYdmUNmaOzcI/8oCJlacs1QXvCUtELEaDhe1MgGnmzah1rUvfGUV4nbQAqLHldhgOif3j392pLEe20hUFalZYRPqkLITy6IVYGFQjcJ/HFcEbrwQGCJbwzensecREzqEPcTqZlLEIPAKBLOLcaVam5/R7QrLXQoEUkBjRvQqTm7WK/yMrqN5A30qAilL/6bivEcAxDDoAfXOBYbHzfHW1ki9Ngs01X49wyLVcMNgqWTEJn9XOQpCpEG7nylH0bnjVMoAFk2wciphLMA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5818d75a-90af-4f51-de1a-08d9dd24bcda X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2022 21:26:51.1031 (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: VI1PR0301MB6670 Subject: [FFmpeg-devel] [PATCH] swscale/x86/swscale: Remove superfluous and invalid '; ' 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xjR2gRR/EXaT Inside a function an unnecessary ';' is just a null statement; yet outside of it it is actually illegal (but compilers happen to accept it without warning except when using -pedantic). So modify the macros to always expect the user to add a ';'. Signed-off-by: Andreas Rheinhardt --- libswscale/x86/swscale.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 3cf0c419fd..73869355b8 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -384,7 +384,7 @@ YUV2GBRP_FN_DECL(gbrp14be, opt); \ YUV2GBRP_FN_DECL(gbrp16be, opt); \ YUV2GBRP_FN_DECL(gbrap16be, opt); \ YUV2GBRP_FN_DECL(gbrpf32be, opt); \ -YUV2GBRP_FN_DECL(gbrapf32be, opt); +YUV2GBRP_FN_DECL(gbrapf32be, opt) YUV2GBRP_DECL(sse2); YUV2GBRP_DECL(sse4); @@ -405,35 +405,35 @@ void ff_planar_##fmt##_to_a_##opt(uint8_t *dst, \ #define INPUT_PLANAR_RGBXX_A_DECL(fmt, opt) \ INPUT_PLANAR_RGB_A_FN_DECL(fmt##le, opt); \ -INPUT_PLANAR_RGB_A_FN_DECL(fmt##be, opt); +INPUT_PLANAR_RGB_A_FN_DECL(fmt##be, opt) #define INPUT_PLANAR_RGBXX_Y_DECL(fmt, opt) \ INPUT_PLANAR_RGB_Y_FN_DECL(fmt##le, opt); \ -INPUT_PLANAR_RGB_Y_FN_DECL(fmt##be, opt); +INPUT_PLANAR_RGB_Y_FN_DECL(fmt##be, opt) #define INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt) \ INPUT_PLANAR_RGB_UV_FN_DECL(fmt##le, opt); \ -INPUT_PLANAR_RGB_UV_FN_DECL(fmt##be, opt); +INPUT_PLANAR_RGB_UV_FN_DECL(fmt##be, opt) #define INPUT_PLANAR_RGBXX_YUVA_DECL(fmt, opt) \ INPUT_PLANAR_RGBXX_Y_DECL(fmt, opt); \ INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt); \ -INPUT_PLANAR_RGBXX_A_DECL(fmt, opt); +INPUT_PLANAR_RGBXX_A_DECL(fmt, opt) #define INPUT_PLANAR_RGBXX_YUV_DECL(fmt, opt) \ INPUT_PLANAR_RGBXX_Y_DECL(fmt, opt); \ -INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt); +INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt) #define INPUT_PLANAR_RGBXX_UVA_DECL(fmt, opt) \ INPUT_PLANAR_RGBXX_UV_DECL(fmt, opt); \ -INPUT_PLANAR_RGBXX_A_DECL(fmt, opt); +INPUT_PLANAR_RGBXX_A_DECL(fmt, opt) #define INPUT_PLANAR_RGB_A_ALL_DECL(opt) \ INPUT_PLANAR_RGB_A_FN_DECL(rgb, opt); \ INPUT_PLANAR_RGBXX_A_DECL(rgb10, opt); \ INPUT_PLANAR_RGBXX_A_DECL(rgb12, opt); \ INPUT_PLANAR_RGBXX_A_DECL(rgb16, opt); \ -INPUT_PLANAR_RGBXX_A_DECL(rgbf32, opt); +INPUT_PLANAR_RGBXX_A_DECL(rgbf32, opt) #define INPUT_PLANAR_RGB_Y_ALL_DECL(opt) \ INPUT_PLANAR_RGB_Y_FN_DECL(rgb, opt); \ @@ -442,7 +442,7 @@ INPUT_PLANAR_RGBXX_Y_DECL(rgb10, opt); \ INPUT_PLANAR_RGBXX_Y_DECL(rgb12, opt); \ INPUT_PLANAR_RGBXX_Y_DECL(rgb14, opt); \ INPUT_PLANAR_RGBXX_Y_DECL(rgb16, opt); \ -INPUT_PLANAR_RGBXX_Y_DECL(rgbf32, opt); +INPUT_PLANAR_RGBXX_Y_DECL(rgbf32, opt) #define INPUT_PLANAR_RGB_UV_ALL_DECL(opt) \ INPUT_PLANAR_RGB_UV_FN_DECL(rgb, opt); \ @@ -451,7 +451,7 @@ INPUT_PLANAR_RGBXX_UV_DECL(rgb10, opt); \ INPUT_PLANAR_RGBXX_UV_DECL(rgb12, opt); \ INPUT_PLANAR_RGBXX_UV_DECL(rgb14, opt); \ INPUT_PLANAR_RGBXX_UV_DECL(rgb16, opt); \ -INPUT_PLANAR_RGBXX_UV_DECL(rgbf32, opt); +INPUT_PLANAR_RGBXX_UV_DECL(rgbf32, opt) INPUT_PLANAR_RGBXX_Y_DECL(rgbf32, sse2); INPUT_PLANAR_RGB_UV_ALL_DECL(sse2);