From patchwork Sun Mar 31 05:30:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47676 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94124pzb; Sat, 30 Mar 2024 22:30:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW1uUh5nn8JYAFJQdUAXcHobe74kWUL4xq6GfTk/oulv3H/4NYYcH55nsejBiDFA/r1Y3/xqZ8BEZeYTDxNjBuABAeZSTwQ7olSWA== X-Google-Smtp-Source: AGHT+IHEBpCzhpmDX/KSvbsDlA0EVkvDjtaVf6UfgLbbuHHkXQWd/Za01YLdrByuJWb/w2CkkhQH X-Received: by 2002:a17:906:7251:b0:a4d:f682:50cd with SMTP id n17-20020a170906725100b00a4df68250cdmr3478629ejk.4.1711863057850; Sat, 30 Mar 2024 22:30:57 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h13-20020a170906110d00b00a4671c9ae68si3295192eja.489.2024.03.30.22.30.57; Sat, 30 Mar 2024 22:30:57 -0700 (PDT) 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=FQKzOixL; 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 5515368C444; Sun, 31 Mar 2024 08:30:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2035.outbound.protection.outlook.com [40.92.89.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5230A68BF41 for ; Sun, 31 Mar 2024 08:30:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AhzNoaOscmSrC1XA+oNml1k0Gi2chtCe8yGPXrpFGb3/RM1s1PeDmDgWqzL04FukkdVVN30hz0ZUukhNOFt92leST8NqbjUZtzs23DddbWpnYBWnIVm/jUftX1xtsqBHxosr3ZdJfTRpUajTT5f5MHRpXYJCzGvP2OwYBQDdeUdu3AOnhgaAN5sRAEJ9hZV2H/R08RFy665qy6hruxBW8DwwWBnzxQk2zWNcsspEQ5h4RMYvBXZEVwDlCJgaeXgmemgRAp2hO8oowo8szsXiNWMlwEGIx2YHyEizAqyMfbsSHC10GO2kf1dizlnkHHZX0ZoMWWSWHJKWws9Do5w1mg== 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=78qlzlA5YuLks/DWBNzdgdOERBV1UhaGIH/UK/+vfqo=; b=W6Ejs6PtWMO9Q2ggQHu5m6WLcP29y2CiEgS45wngRIN8qV7o7Du4C44XTsLZuxsCIRLUtU+liss2kE0M6FldHahlP8+YYP+lKijQHjhC2tKcZ1IF0NUQ6St0d7kAJ4qxCyJzvnimnWr7ddP16JBtPzj4970jMudYe/EHIxyDvVKnCOp9jv3T4Bz7OuhfDS2K1u6SGLbmAG+myfeG86PpLnMiP1XnqCDkAyt4OyXLoUIP9iQBPhaD28H+p10N5lg1UT4b+nAu+WEqCUASSHAs/IB28J3cb3PAWV5A3kskOCmMwbdALLOHBsZa1tym39hC0oYsZsfRPwmULY+syIifLg== 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=78qlzlA5YuLks/DWBNzdgdOERBV1UhaGIH/UK/+vfqo=; b=FQKzOixLgryXhKmmBb+f7pfiO+F/sIXiO+ltJjkqgkeg7rYDLxDMsZPWIGVe3y4I46joGRyohMbfhjk9W5GYbJ4F/Kf9gIc7nGNY4fcr2txUln+bs3ltDxddSSMByXXz1zxkebel5lyBlEsYUhjC4W9rDW7VrHLfkLysg7xnF4s4J7vv+JNs0vjiQOUrba+UMRAk9PPg8xg8Xjt8jHachXxdiriP2xYcqG2cC6tk9julDJ7IwPGksIQw3pFtZjr4IIYj2u0up+pjs/Kb7eDCrx77aVlayLGh1V0XB0qfIyEXtUPCGcOsIYUGuJ+xzV1kc3YSssxOWswJsdalVsREiQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:30:43 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:30:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:30:26 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [e0xAvUrGEPDIeRHmfbVrX6FUzTWJtrYpapCj2UvpzrE=] X-ClientProxiedBy: ZR0P278CA0126.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053035.293689-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: 72513bb4-ae83-4232-116c-08dc5143b5ad X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /JTTFyuB+xGsgIl3GB1YXVmdnFkc5D/6ijpJ+9r9k4yeewIt2Rl8A54avBGGKl3T4JlWZT22mddMNQFM60JIU0i9iJ1XscfeWD7RpJ2iy9zKMihIsFvGUkcXj2FRB+ybXLB3ARon6fh35K8dEKub9kEdTqNRBtOoE5sxbIU0fI5QKXAuepkipHAQr8WbsfYWLp2Un9TOUPIQssYGNXMek46luuqpnSddLJnYpcX6417GbW1s/hJkrz34rsxusLatex/+fV5k2BYVTpiPKG/Cm9EIioN4+FmlXc5Gd+c/cUMHE2M7VpR8MV8bM24xqFtHAUN+E/aUwJZ80FhKsDqmf6FZrFtWV9OP3Q3w0HiVtzrBXye9pxGZmhhwJ8Ay4UFV8aOLK1+MEgGpdBk4i+wBVfiWaOENhn4jtYIlTnErAinB+MlmiehMQHDJzSOBUo1v/I2c61U7XAwPVmL3Bmym3g+kvdOxP7udMtuYdwYlex+GgYQdzNvYJWmEXGroNCmYEAhK+N/VCfNWvcuWwSJFx6eygeftIu7H4zX1+4Dt5sHCTyJLSEsKsUCyu9v2UXu5ir4/X01O0TUjxhrTSksehgoelKcg4h0PDb+aAXVxq39F7z1QrVFWIgxCPLN+Thys X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8coDiTfjg08j4R2CMqStfHAwah+beqTeYZhgk/0xybXMKgKBdHBA4jeVu6E4WJYbU/YZzB/DTZAx5NfjtzYYsplI6VmlOg1zXBpmSEJ1FZwoZdSEuBHJI1qhTQA7VpJevwNuWFFs2cJU9JUDrE/ap8c6FCUWyD9Sn9VsiQXTMesKGcqN0miq1MKi/8Q/XOKdoP4YXMcwTbjUQBN+wF1UcvKRCWQTkO/C9+v63JG+7191otfq2QsenDoLP/7yZqquO16K+BagPtz4iLJG8dFP44kqpuGknAlcIjUNHUlyaC8vlM5DDfGS6PYwpzTPhpC9hNnJWegVN4nFtXT6XvdUcaMNumi6WPkMDRcT0JnP0k/LaU7GIfFY+TN7+oJoIA2nQboK27pp7LeYtw+I5YKn2ku/Aw2nw9v3In+k6h4TYrcw2z/ekbughnokWbpktM1gCdf23xEUEDDF8/jfyosA4SwI53pT85E18mvgcxe6KmHUL9fs4fh6mJFgEMr9b5Rzhm5eOWaovi6YsrWqRcb+4yqKHxrVuja08GjNcs0sL3FGU/VWZVV1xJL6sNVWUIcbWLE41mikBQ50WLi48iTTmunqpK6jrTrI7L9A/dDDoJgjbw5H7RC7kGx0By9AtbVCBC4fPqXev2vJS+QKd7KQ3DILIRsqn1HThFUowvtOZVjtU2jcWnBsII3nZQdz2Mi9CKrFhKd5ykbeUCTOuf1U+0sDrw9L/yh1mZ6wOm0ohwXrPrZT8Kr59ltDNsEdG5HX608WaaY0IWwJiTbpq8Rs/ZdPKIZA4KYUY6tmM19JsQMrYxNaHr1107tCn2eOV++uCXEshyM0NcycBu8W0E3TCZF7ARRArCkMzY04BUKRFfYDGHR5IfYnrUlnsKT46SpfnxiSroYvKqHBhNlzKrv/+0+W8Nd2GvwX4oMJgQlFEdQuJ2vzH/z/DPgnxYZlYg1HD7X1oLwecye+yH8lmwITth78BLdK2NXfSyabEE0A884iy3eaIO/KMviYLxI+zON3lWXBbxH8zRfnJK3mQX1E6UG3UAmVuunfu6/zB6ZpaYADrhTsCUEu4owmaPcycTpw7igXMcr0S9LnXBNESl3l7K1Uc7nPBrhPjmylzWzm+hEfW4ryduqKMNlIHJIsqQ8WOlk+UWsFYPvH6glzcI+HQByzjmYeqs45Wv6D875nPMqznb1iredFFKcwOzQBDNSDeLBEzqlTNDFSamZu1Kue/SbNmXcNdI4rF/zJZsf1MQC8GG2my7YmG3D7kvP0xiLviAUy4wi1QltzVAmpGClEPg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72513bb4-ae83-4232-116c-08dc5143b5ad X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:30:43.5355 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 01/10] avcodec/libvpxenc: Avoid unused-variable warning if VP9 enc is disabled 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: 2e0HLlshnr5/ Signed-off-by: Andreas Rheinhardt --- libavcodec/libvpxenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 635cdf7a0e..bcbdc4981e 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -49,6 +49,9 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#define IS_VP9(avctx) (CONFIG_LIBVPX_VP9_ENCODER && avctx->codec_id == AV_CODEC_ID_VP9) +#define IS_VP8(avctx) (CONFIG_LIBVPX_VP8_ENCODER && avctx->codec_id == AV_CODEC_ID_VP8) + /** * Portion of struct vpx_codec_cx_pkt from vpx_encoder.h. * One encoded frame returned from the library. @@ -359,8 +362,7 @@ static int frame_data_submit(AVCodecContext *avctx, AVFifo *fifo, FrameData fd = { .pts = frame->pts }; int ret; -#if CONFIG_LIBVPX_VP9_ENCODER - if (avctx->codec_id == AV_CODEC_ID_VP9 && + if (IS_VP9(avctx) && // Keep HDR10+ if it has bit depth higher than 8 and // it has PQ trc (SMPTE2084). enccfg->g_bit_depth > 8 && avctx->color_trc == AVCOL_TRC_SMPTE2084) { @@ -372,7 +374,6 @@ static int frame_data_submit(AVCodecContext *avctx, AVFifo *fifo, return AVERROR(ENOMEM); } } -#endif fd.duration = frame->duration; fd.frame_opaque = frame->opaque; From patchwork Sun Mar 31 05:31:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47677 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94292pzb; Sat, 30 Mar 2024 22:31:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXrz2ijpqPYM316Tq9B3pT5ljstU77/39OJU7/R58K84PtpmBFcjiQ/Mc/LFRK2+koaQlvD3TENGqtaSM6UYnVvMERTGOuL+1MQ+g== X-Google-Smtp-Source: AGHT+IF0ZrAbby/rmImtyu0fikt6haOvUDWQzYYDZhySqp/2uT25t1+Y2TJCKmMUHHTVfeo02RHV X-Received: by 2002:a50:d48d:0:b0:567:824:e36c with SMTP id s13-20020a50d48d000000b005670824e36cmr4334058edi.14.1711863101110; Sat, 30 Mar 2024 22:31:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z61-20020a509e43000000b0056c069bf61asi3368424ede.7.2024.03.30.22.31.40; Sat, 30 Mar 2024 22:31:41 -0700 (PDT) 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=BGBXbgaN; 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 9DE9168CBED; Sun, 31 Mar 2024 08:31:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A37868C25D for ; Sun, 31 Mar 2024 08:31:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gbPCjhNhAznyjgsVkn4N8+L6J8oQYdyRWM17R3sKrvWonSrenPl06u6ph0GjW5wjuMSIhoJUWOgjjV5HxMCoDvMZXrUS3aokWtwOWOnRs6r3fkyNQumUGyfTPlyK9DAmxLoDvQ7xirYc6EOoGkoSB1WXRK7LMM3NKQxPcAKQjxFL+yY4UWYQQ8/Pz9FkTIVGH7a1zmyaPLRMSGEM85cuVmqYHxzxTnB36axFAUFn3BTniueKxALyclFa6asJ/ka5cpCtuhJqTqO9oAdc2fcsaPDZKp7EN1mJUUWrd5sjWciYRHLyCGF80wykzkUp1xu42Y4gQGeDWTkyA3PAM+gUkQ== 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=klPsB6CCMS4uk/srAo748jif5oWH4GOsxrjjP1kcixE=; b=gLDfN+9C+AleiDjknU6ZJfScjYPz8QFrbtiqK6zYecJvzKNvPKNOeN9O57MJmwhPxDrt1kW7VuWWbmbJXNEp1TFcUhYL0XNcy0EQzu5NKqAfsV/rFP4PtxrxWSzEs5iDDkrYrRW3ZSqPcLBHUMr81Mv0ZHiOZBcsHaq2SV3LXanMj5ehH9BoA4Rd/kO+gEu2CK0ewD7Mctcr2lFfIf8f5RU5ifMR/Pjkutni8HOT2uxKgAvMUtT2IH7DRrI5SSURY2weT/ILeT+5mZYbb/DDE+VPEKUjPLPU32p75N10ydpgfmRAsYqbhI2KGhxb9LG9fVibvM4GuEPSzggYJcpnFw== 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=klPsB6CCMS4uk/srAo748jif5oWH4GOsxrjjP1kcixE=; b=BGBXbgaNwn4SxKsfD3f7+AnNZ0JiP9XsVgSRR3Pj517Aq0W3yMCNo5ERtCW4/J3eUdWa4G5xR8YIQKkDNoNOE+nOy9ABmDrsIt4Ua6+YQMC5rf/FK8aqcqL2bPIm0DMdyBe+NBYsYUdpjhEUOcFuGqCc4TeC9gzuLnEIaHaGi/+unKwXHvfU3hRE2Ye0RNs66x6x5/uvU0LI+9hJui/dUnF4KymKFrlZe30b2d6juZAHqIMY0xbN3nAo5+WdYbCwDZK179mP/P/9/XMUEoTuNQc+dgrv7cAEL5Vc219NluTsh+AKr0HP2/QXvb1eN9KJJQ9JJduLI/2rIHxeQsu2vw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:30 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:15 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [HO/5d1tJCKef5/1d+VwtRumXZ04MRdFLjPp1ZijA90c=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: fa6aaa39-e317-4768-b554-08dc5143d19b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tvp/K0/8ThlJK57QDQPx/Qakiy3omckhJt632JcpMk8d35T+5ilbktUX75wJ8t69zD500gznFtzCKkHUo/ryozde+gU19LYeMakEOXhawLP01OEnLTEHK/nDlYr1VEV4wKKnu4IJ9LopLDO2ciWCfb2XlqF9buoOLhkvuIRLryNGucxgw2pdxKL3P32m7Wu4rCJfYWClqq42io4YxcfjMuI5LN4mpvI+IJZDuiyoYVwNrHXh7S2BpapVqENocZYjnQaXCVUEU3pdUzqsmJXuUGVagi1Yxpwdld4AMMWNUBEcXZQOTH7oG5SQ9jcKcjKYASH8xrAhDeTPGKH85X5T9mKOlunf7ExGOhLFUawgeFDCa5BiF3aFeIEZP1uycVGM+nYCZ4tA78wtOx40DFOLAVD4t/CFljoRSBbirU0VKdTvBpM/PTp0ARs2xQAdOkU5m2Lyd7cswWvlLmYv6i97N1YEqJLS32+zu5lBoNC9ImthGYkMTxniBP/fclbNqEYNeDVZnnt11ReSDbxRci/REtn3IipV23c71/A9/KYwU44YV6tgJqfRNRa8WQxjL8QRSf1deOXfR6ROQfAj78Y1xkYdjHqeyx4mz0AL10utS+uRJkhAAEq+BrhUv+oVy1n9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RCmpx11WoMJ7i5Mj7Gg8lSIvbngly1jDhEDgFifFV8lz2whZS1zg4Rmx4b+Dc4H92oCN5vxB7sYXWcDni0s8Xv5po1tGVc5DGg23+GKj1d3LpR12OZCfJqAT6QxiEYXiVxg8oztIWywy56WlGH8cmurF2RnMJawmpw1lnT4Wc4kbqtMZAhjAME2Qu53QvBB3Z/kUHdhvKzZOqvZ81f14N+zvgvGFj6yrygmlAxUeknDGqt2GeZ+7E+HCems165zMpQpbTpMv0fUtYLC3EfNl+ThgsdoOIMrA6nVxnVkIUfN7NYi0kjXQSNiTkRhk4VYY/AbrmQY9Npt9PdRc9b4yEOLiae9UGphLloGG5OuGcVE0YBHzdeUSdJV+qtNz1uYDrFWCRGJTzQEdDdLiK/eN8BU8rbNOT97cZvS6SIaTR/ygnz81E480NAN5tq53nilq2pIxKTZjuB/p3ibLvdugcgBAYRm81kw0ss7xa42SblLCyyXPOzQsWDQO2A9jgp8hRN5LJ8SrEU5CRa8aQEhVK+s07wosfn2CIgTe7bDEIH+6nBEoPwn5CEK9XrKQbm2MeNrp7JxFnpOtqQmdoU4JY+forLZNnCOnk7iFtLbpHBW8qoU7X8b5t2THCCCJEDtfsYPRz+M0urbqfxr7uf77exbC4nRyYQXre9XCpAuvIdlOJWwBIf2/ObNJk6tVb+3izC9lG+Aqp3lPElLG34TqT6fnG8oEXr+Lw41D2YferS9C+deY+uT5fzTlwRwn5k4eKp4nJpdBkE5CIN8v4KNHCmXTkvTtO32x3jKdzMwGxugPEkCyoeoNVp5ticuMw9QoRhg1EOxLgG3ArJv5oPOF0wxzr/XtfLK725Xp3IODSo29YCHqjc3zoCz75bXZC6oZJGci/T49MglkJTVc0LZg/fsYXETSuOhZwO/j7ezIcV5sTxNipeHgwi6jtInhfB+D1eiWwkbXu7lc7pWrWqn1R+sTSGsTnkrjGVDT4O4dKsHY0K7GO2h3qmguOVjUCcRMlhxeVoZQhbhy6iHuVXfnZG93Y8VxumLwDmKgqYBXG7dh/aKP+DrIU8s9GTXKJlXelPVazyqRvv9RRn4x0lHyXFFbIpjNq/PSTFC0hCUNIniguWTwZxC25M6ngaRrzNXPjzCdp2WnVjHB+9SrXlM1/DszD9MGYONJU2fp2Nzgk4FD0eOCX+Fcz0rjwxaKSXF/8ZGPtFTcByTGQrB0tCNXRe+qgYxSuUnjK7AEUKQSMJOzU06Zg6yUD4j1Jc6+ZVZ5Thl+lQwgttbd3yi8tMGpnA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa6aaa39-e317-4768-b554-08dc5143d19b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:30.3544 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 02/10] avcodec/tiff: Don't cast const away via bsearch 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: vYW8JjlJR+9q Signed-off-by: Andreas Rheinhardt --- libavcodec/tiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 1b934457b5..19301d9e49 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -176,7 +176,7 @@ static int cmp_id_key(const void *id, const void *k) static const char *search_keyval(const TiffGeoTagKeyName *keys, int n, int id) { - TiffGeoTagKeyName *r = bsearch(&id, keys, n, sizeof(keys[0]), cmp_id_key); + const TiffGeoTagKeyName *r = bsearch(&id, keys, n, sizeof(keys[0]), cmp_id_key); if(r) return r->name; From patchwork Sun Mar 31 05:31:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47678 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94341pzb; Sat, 30 Mar 2024 22:31:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3iqZ9+VPnTxAi8kjzH8qPr8nlz4mRTeKrYrpMdISnpN3Pu4aCcN+Doi82hD946wC7ytooct7RuxCMN3SzbA6WzFrgXDhaeF8nlQ== X-Google-Smtp-Source: AGHT+IETa2L+vhOX4jGPQvXgJJpxU6gTOrWaIiaLhwNMZxa2I8ObXARlZguf3YrC96HkbZy4YFDV X-Received: by 2002:ac2:4349:0:b0:513:7e83:b3f2 with SMTP id o9-20020ac24349000000b005137e83b3f2mr4896643lfl.45.1711863108923; Sat, 30 Mar 2024 22:31:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id pw12-20020a17090720ac00b00a4e56729100si815373ejb.1043.2024.03.30.22.31.48; Sat, 30 Mar 2024 22:31:48 -0700 (PDT) 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=oION9l26; 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 9B69568CC35; Sun, 31 Mar 2024 08:31:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5453468C30E for ; Sun, 31 Mar 2024 08:31:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h5grWkaREdIhEXmGg4NIRtCBeDUc98/kEetqtJPaZaA7KAa035srKFDveOi/IRbPrjadktFXcRXWyeEFCMzYebSUY3u9FwLkj0wgxy3t5oBQ1EPAN3rT/wuod6wSilfHb79mFZPOWSjDW5BshP03K79ZRQ1Kxs/NMKfQ/nEAc7w3ub/Bf8EMRA3MigJA+uQg6L9gRofiAiDFt3Ogt8Q9ODlKDqAle4hOVL+eXb7okQbkvEXJSQuwXKkTCHwIgUgoxotivMJGtGbTgFgPNOMOTAh9AHrwyYwJuIsTKhFF7aJIUajQrt34KrgGyXVIe1zK9nHnr63jnNb/BL3u6BuzvQ== 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=OC2tmP+iPmFEfnLtf2GOUFD0npY00sj+R+dicYppryQ=; b=ed8v2Sr2kA8fFXGlFbcolskiVBAftve6kWL3huiSGpz3/rXfKem9IjxE0NljRs6zMwgYX4LhYmSIIaKbVuS0BZOnHBWkekU1jacQlMsCvazoQ9xoj+WSk93soRYe/OW3c1KJ90ZOZCO4lSHvV3IIMFiG40dVwhKMQJay4rgq8G3KZe06HGdd72APxLfUPq8eQabtLdGwM8auUXrOJci/SjMp0HsXwBXPT+U55j0rN3urXtdGUr+EnOkdVdH48djzLdLCLlKppHDE4SjGOm1UcylyhAP4yC5idDslKIzHmqpfJRs7IAvHjlPQb5m+IFojBagX8pUW7G7Qh+Yi2ngkaQ== 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=OC2tmP+iPmFEfnLtf2GOUFD0npY00sj+R+dicYppryQ=; b=oION9l26Wp2uxO255YBz/iL4eipPy5X0rP7IsK8kwkyMjpR313Fps255vLS2Pp9TWHP9Apa8gxczcIEOqwTWvwHKBXJN2yQ5X6/4LgvA3NTOuieT2OM9+kj61oCNakOMeFFbhpg1HCrZTaZLW8YS2CoI8CCEHoshe9CRL2UilxEq3x/7jThYZdYAp0eQVK0v+2jH8s1TdepZjRT2WU8ssZdjo1/sAKkt6vEafilrhDZpfYbIRnKPJS0kCY7UO23SCNwp4wED78zyOTs6C87FzMkMkP468SAEDfIrX/kDpKlAcB6FbPj7j72gZg0bzI3r/FuJVcO4CEmX4GSc6PlC2Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:16 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [DHpplYp2JncMXc82ZnQFVfxI74vXhqe6qqC/od6gKRQ=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: 11521666-854b-4ef0-82ee-08dc5143d280 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VW/nyWr1EfNvQ2p6/UiamYWc8BDnh1Rv8pyEa14kkQYXHv7mot7V3KWfApKneL696QaGsOexRZRw5g3PahpezkYGuveu82Hpx2KdFgsTs/yWzuHvNL+txWivStLd2wzkxLX9drdutP8X5d8fDUfCi1EbrRe/AbYro0XDBbFcEm9Bo2NSfpNWC8Tyj/h0/Mcy7FGEEMS7uvNJhNnuBM6+GvhulakeqE/XrXoc/znr0itLKxi5g7GMNgRcri0jLSjwFeoVH+KQAFCVjSm6+5fTV6TaaIawUix1pxUNum8Ry+OuFchB4qv7Jy67JBQ88AGtlh+dIZNl3aHrjlbiV7e9sh7/gIqM0+tQ/uG5rCsZ2XgDkxhM6Y5UQuLu3n7IiqpLJ0Kc98KBQFvqBPrqpk7ZegdBJUGKdbWLklwzZBXUBXj3/vJUmQaNk+TR8UhGV6P2LSp7qOMlKGCAELiom0YfAcrtWy5/68mUxB7F2daxU/NDSBaXX2WIqsihvXEFq7u73hgAPIlHhmjW0geUuyFHW3ueUy0XtpcocqkT9WKTZlJoLQBRTWgfOsg29Fya95uaZLHi/jl0i3czPcRDjQJo5JSF5LdxvcM4u4IYObwgFxHUn+JLXJ0FGt1o6EHOdaor X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2v3LuCiz59FbjHPw7lvgiusZZsSGH+lWIIeFuAoZ5dJL2Sly8upjhDoZHPbXB7iSgNUhHn0y+nBzP9gVbKLMeD8c7nGU9vdmXHyhvGjn/6+6xeRxoKvfZr2XTDuYUT2miI+yxjcO0KTXUNSoGaDaKCzfr8HL8eg9mIUwSPCfEcDmhxUKn9yrwTie/cpXgis3ONr2qONZE56huvV+r9hndGzFMD5OhnM88zPKuoJxGwR9wC7gTZ7CH7jCS9DD/WtkMRxRJPJHyMDfOXdxNnNWSP/kOX0N3Kq5GDg76STPugKo/CF+2WVl6jhgUoNt49rt2zJ4AexXbomvBx+OfWCpO9/7azpt7H6pqmvrk4/AFK2EEEkLmRbaTgdylkA7kFDn/2yLsH4a/eEq5sLELHdLUa0GrxO9fPXv4VIGrcjhSVxReS8GJNORw4NZ9qiNDoYTZ4KhSnlM23uv02ZX+96cRuMlZqQPZgE8Sz04z1mdGpJ7c6N9D85zftgHDKEjCHbXs3FpL5JKfMeVrXxcb69ukXUXpspPR1EJ7DBhjQgH4IiKPEUBiVBjK1Z4aggP9IWiclaWgrqGp5Op3C++Fk2sYdVFgnsjm6FzxELHqgny4wPeCDwBZjY+KKnc1E2j3enHEDIfujY6Q0iTqJRlvVTxLN4hhwSok/fx4HpFVZd6NP9efc4mMsIFtbtvqyfh8QLR8kOhNjURjxgd+oV6y5RgQ/tcgEwr/bSIhxBKisOd5zyCQn/HvRvNVM28CDXcFf/tQh5BR9yPYd88/VynLMUNCeG/R5ygdiyDS7Y4SHlyPXUoUrL2S7eeoiXjGm3U+ETwkXu6Q3H959i3A4fkYaiOcV4qMRkPRmeWAZfLChRQGiv9dApF7zhfCUAv+75JvgsJ+VHHukGALVYFFKslA0U+tFG8kztHk+mOBrm7srX1OzrTZAB2FZ/+XdvFYrbdLiIX4C7PTWffC+5DO3wfXQSVI2X4lvK2oiipmGHsS/hoJwrN3cyKSGVw6/HrCxmbkekLZj1Xg3fayZxD5bTj2e/L0Yqi17/skETfZoSuuqXTZnKfrBeI0i9IAFhYqztReytB74k8cHIFjEX1arPrNQ+VZW3iACvpt0ECCzxc6aO4rSY81gtJ/V65XnAF/ZHwE4z6Rvt+sOhnRckOLZ82wN6idDgVj/v4yoj6SCyqM3xecly2uE5ZJ9bXXiVDC62l/yBx3s3KrxcOxbEhg+yxGUfXOBgZVIkBYkxI+Z5TwtLcGBEIJzl9Z3MlACfAt8FYUCBupvMvMyA4OZqQnoWVCDWU1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11521666-854b-4ef0-82ee-08dc5143d280 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:31.7778 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 03/10] avfilter/avfilter: Use AV_DICT_DONT_STRDUP_(KEY|VAL) when possible 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: GFxrQYH9z27Z Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 856862a393..508fe1b26b 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -844,6 +844,7 @@ int ff_filter_opt_parse(void *logctx, const AVClass *priv_class, while (*args) { const char *shorthand = NULL; + int additional_flags = 0; if (priv_class) o = av_opt_next(&priv_class, o); @@ -869,7 +870,7 @@ int ff_filter_opt_parse(void *logctx, const AVClass *priv_class, args++; if (parsed_key) { key = parsed_key; - + additional_flags = AV_DICT_DONT_STRDUP_KEY; /* discard all remaining shorthand */ if (priv_class) while ((o = av_opt_next(&priv_class, o))); @@ -879,10 +880,8 @@ int ff_filter_opt_parse(void *logctx, const AVClass *priv_class, av_log(logctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value); - av_dict_set(options, key, value, AV_DICT_MULTIKEY); - - av_free(value); - av_free(parsed_key); + av_dict_set(options, key, value, + additional_flags | AV_DICT_DONT_STRDUP_VAL | AV_DICT_MULTIKEY); } return 0; From patchwork Sun Mar 31 05:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47679 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94376pzb; Sat, 30 Mar 2024 22:31:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUZg4f/3r60ImaXBRe5xxtq68A035E2gaOwSaAcaHQsJ2wRj5SChMH/pdfoK4aoEaPVGFGeY+yUGvnanOaexyLSKzjYj7tbwWksEw== X-Google-Smtp-Source: AGHT+IEkoYNWHOHKiPFbvFLM3akK1Pac5AZ8C/GqXrHr8TYhPZxkNfFs7js6vlMdhP9Acz2GFE6i X-Received: by 2002:a2e:9ad0:0:b0:2d8:1276:33bb with SMTP id p16-20020a2e9ad0000000b002d8127633bbmr375143ljj.18.1711863117572; Sat, 30 Mar 2024 22:31:57 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ku16-20020a170907789000b00a46b8c85631si3410417ejc.1014.2024.03.30.22.31.57; Sat, 30 Mar 2024 22:31:57 -0700 (PDT) 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=UmR4dbqq; 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 B43FD68CC2A; Sun, 31 Mar 2024 08:31:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B72A68CAED for ; Sun, 31 Mar 2024 08:31:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ea6GvBQ58IWQwi/2niY0TPtgUVw0Q8v9G92tNMNi8HjICqfKRbjkMAAV8hFgTjOoMmIX0u/UWDcKDJ2QPJR8WSmzhkuc4k75I4Z6Myss8NAu1RYkUfSSScSdj+oAm6qRKkLkgdkRlzxQ4eosvW/TXJ+QqcoyWTZzXLbc1bgX6FkQO+AG0XgnYQDvwHU6D5PHfv8KGuRSx1HrvrCH5xfhymIm79DJADXx84WF8WrLeH84tYNFiJ3Y0Y8cz3Aq8K4iSfpdirCnq/57yVaLwnP4H6rzsLY/1NeBGz8IOW+qm8zLzcLvZ/2dJIfKZGnsf5yOlR7DaLnvdBb/oMEjEDT2Xg== 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=ctM7zu3t+z+VJFORCJnAfCwkHClflSuyYVaHdTut4iM=; b=XZe7D/j7XcqklPoz/gnEDEZFuEn4z08zwPN0uNCD+1uSthhrOEAowXx7D/yn5UnvrqMxaooMo0WgYCacv23UGWgDiVSS+n1ZBWpKSjGDU27IhFdn87Fx4bockcjW9Ktvml16Mh81nynNPWOaXIAawdC0w6Pb9LxyB7kvGKDWzb/ZnTHfGGy7FacqJPJmjGIbLnmycp6CWTvHwMc3S5OVDKgb+3PWUs3KqyAMXIScoZLvk5qbhu/arwc9YvsYRR7sGoXuFRa3yXIOGBKycIOzBoZtd+bvE/BeWQ6oVOzCL1SeRsZNJtOyS7G46FokOGfh38rmrGFv4jk8HleIXHYBhw== 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=ctM7zu3t+z+VJFORCJnAfCwkHClflSuyYVaHdTut4iM=; b=UmR4dbqqqcWP7lmMQ9UCX4LcAhBNnFQpP4YulGi8AHx+YGI9KTE/vR8mYaoFXZNhrKtYOoRvdOjVC8zFix4p+el7PvLPI7TbrZbTcjC1naOaYnck4oRTYShFt5775cY5gOxlMnPlp9raIm3iV8704KZZwXxwqGhby3W0LmQcbJmAppAvLzjh9GDLQK7hu+et3tBPzoN10C6s/WB+Rdr1g6lKos3hBTfuug7A2EQTIrUp82axE0JkSsptl1CKI8D3KWa0vouYF+tEJJpVXZqJGqz2jc5/cRQ6nbfvhNqSALaaVE+RT/IzcecWtJGaN24MfNtJKd5Y/q9HeHIg9WDjeA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:35 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:17 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [fvyquOP0gdIhbmorun9UK38/tjTHbsRMcUN5rP/vjo4=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: 8676e81f-0af6-49cd-f6ea-08dc5143d4c5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /omF3Zd+LmIXr1dbIK0AlFea+AJZRGP3PwLxk4SoKgkrG8Cd1D1EgqHTXJ3bzsytBbkMkNHblXKtvYuoQm41Bx4QHKgwBQuiXSkJ5G4hFRNAphmrxzFtC9fK5TZXZ18l1DVHgOS5nLH42vBQM7YjT6WtNQP7r6YhHMdU7iC+rdqGCWNqlDeuBO5SCJsNWdohZweAxC78CTx87t6o8QTenf86i/MY4R+xj/y+A09Vf+1EUlISRU5N+YB1UVZ/hU1Hd2yjxSRSmz/meJSG21pKs+D7K6iBnzrJxgr1KeWwUb9zAtsk9g8RSyH2Z7NPnPxS6Y5hu0qE9cr67KeCgDxeKjD0jUAVwCZ64n9Uwec6ZW9q9cNXzJ2P02GyofG39XKokil0LiGjKwU5Rp7lAnF/FyVCVwb9prxDdf+Xlh/RQBWh0sQ0m9b1SV6IEjmbuzMDErCLperWdn3OoKV0jPXJZiqZyehJusNm6tU7uk+OIH0srNL3aZsz1YhDEzT8BkqBvjAZSrLnnL59NGdnYSofz5ikWttJ1LBGDwRpa4rNHg2iN1y0bA7OxCjzTf2/NHzbAB0SqiKitd19ncVb9EEE10mY7CbamfTv6/Cj+g5zUBRaU0yLKw7hTBofjmDG8Lov X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0vGYkP9eE2XCndOL1KaFNuc+sDps/K2QfHnEdMk1nwFmD4QmkJ4t/cwWUKj1eqy+FVtvnJbfjVIvHkyLAsM/wFviEzNFY3wUcLaNfeCIEYqOHFW8h3FfpkknXQHEflUWUeftWOmcnCcGF2PVcSaYamn8b+PooosWBGtK/hu+QrpAfQTkCoDdULQYXY0zmgoJxvbVp+L0Tm1m5A+bCJqRCKO+yrOL+5qAkR30jzFdQ2Q3fqgnpRec0fv58Z7whpXrBLrMCljzSiy4+pcNluXO4Ya1Lh/bm3AiiGKdHrldqxriqOebqkuIZn7oBxumpgAmb+/syEA6Cj2+uDDByHWnWAoJfxiMWE5ppAQtv76znwpTWVUQqlQkP+Iv1PCWsh2lZxrFzNWxyjBaMlK1CtJsGrUTLQsnzB1mZJJ8i0VCtz5BqS6f4l4zqKn3JsK28NVtfs/Lcr6qbsH7l2SGNkI0yUbLVB9+kR9sOyC3406TibUT4jKdBzegcn0M06Rm57ajPeD7PEFQG9Hz8PDwY7VHC1S86kzwGkYOIdBmaXMgIRNKjBjIyK+7/ZuI82FWrOJDzp6Y1xB6CjS2kSJecMcu4NvezdJmlFwHn3ovPCTgHp5cVUDq8yTgj4sCAxtaTgy6pHr0Sx9PrB3M1BvnmtqJtrLSSFPThYHP5AZ/yXsbWu+0bGgkm8ij0kNJ7T5VDHKiigGctn0PDJaCJbZanUlNzexazRDiAiYY0avIXid6WUXdNakdrJY3xRm4YZL/ILS1V5+yejLtGXv4oK1iyuELZsxB4Ig44nkYSbQY7oZYDqMIaUPCXuRQMaYLOdTWdtGxgGBoLah3FdlJ3gjNDAfZrbWxWT/jP0I89Z/u0KfhJpYUlOU1qnbkfJKyM8l/Tf16VyJt43uQ6sD/1K7VTuqcqEVXeEpsmINjor3N98OAez8AMLFJdutLoF1mBgEca3JtEdTpqh95ffpshwPnsxZ977DPwoveD2f+hAlvuG+c7DJp3CQ0MMjlKe2SIQQVFeuoHR26rASrd9U1Akn6J+9UKGuYsFT7OQXxz3otgdpodPxn/lWqN+xtxvAnrl2dPuQr0HDYUh/Jw98zVJBHK+PIxRDZJu6pIC/J5Vfxu7hNEBbaK04T7Wsk5xi+ejunYBwYjBQHf0n7n63+CBVmKDNJpw9MYdd0/GdDlzg2JObh0m0fw+iR2X+zRUu/GpGffuDe8N3SkRY/gZKKVsIbBp1nw4qFnGtLtlozIPSBg+Q/vSJoP32m0tVJluh9X8O1Tgfpbu5xB23aiu0nENq+sCs+IQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8676e81f-0af6-49cd-f6ea-08dc5143d4c5 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:35.6048 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 04/10] avfilter/avfilter: Honour the short options documentation 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: iwQBfmHi9dgG The documentation for filter arguments states that short options must precede long options (i.e. those of the form key=value). Yet if process_options() encounters arguments not abiding by this, it simply treats short options after a long option as if it were parsing short options for the first time. In particular, it overwrites options already set earlier, possibly via other short options. This is not how it is intended (as a comment in the code indicates). This commit modifies the code to reject further shorthand options after a long option has been encountered. After all, avfilter_init_str() errors out upon unrecognized options, so it is intended to be picky. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 508fe1b26b..21d6832deb 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -846,9 +846,7 @@ int ff_filter_opt_parse(void *logctx, const AVClass *priv_class, const char *shorthand = NULL; int additional_flags = 0; - if (priv_class) - o = av_opt_next(&priv_class, o); - if (o) { + if (priv_class && (o = av_opt_next(&priv_class, o))) { if (o->type == AV_OPT_TYPE_CONST || o->offset == offset) continue; offset = o->offset; @@ -871,9 +869,7 @@ int ff_filter_opt_parse(void *logctx, const AVClass *priv_class, if (parsed_key) { key = parsed_key; additional_flags = AV_DICT_DONT_STRDUP_KEY; - /* discard all remaining shorthand */ - if (priv_class) - while ((o = av_opt_next(&priv_class, o))); + priv_class = NULL; /* reject all remaining shorthand */ } else { key = shorthand; } From patchwork Sun Mar 31 05:31:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47685 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94592pzb; Sat, 30 Mar 2024 22:32:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3hEM+gnte2mVNl+NUgerOqPRP/MAthI0PkP5ed0Ldv1dQCkH+TXMzqxAvxYichkJWTlr0XIvdImRamN/1JOmW70NHjt8+OAjXAQ== X-Google-Smtp-Source: AGHT+IHl0E7sMhJymTktAZH02I1Kn8MkkjmTz2do17A9923Bvtt2heU+i1qg10zFR8EJIHWnzKvO X-Received: by 2002:a05:6402:2349:b0:56b:ee71:9660 with SMTP id r9-20020a056402234900b0056bee719660mr4355823eda.27.1711863166047; Sat, 30 Mar 2024 22:32:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u15-20020a50a40f000000b0056c06c4ac81si3348102edb.486.2024.03.30.22.32.45; Sat, 30 Mar 2024 22:32:46 -0700 (PDT) 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=ZtMXusxZ; 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 9CCBD68CDB6; Sun, 31 Mar 2024 08:31:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2060.outbound.protection.outlook.com [40.92.57.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E4F868CD10 for ; Sun, 31 Mar 2024 08:31:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y4ARIaSJkaAnZGwJmrqGAwOx2f9RS8eYlR1jM6qv63IJPz2g64NAt5xkcn71DZGuFKUgsNRPMeu7Ls1VXNp/2kCFW3/SDB01kdh1lraIvneRhBzwBHA4tI8S6wwWgJ3S5JEyecc+kI1iYu7wkFlu8KHJXTN1siW3s5ctUMLxeeC6WcR6WxbME/bzk8zy7pR7uO1q3RNNcgPXj/U6sFsQ/6h6yNVsD7+qJJz3eEeZPwR7WgcejymZpXQGnfCVp8/76ldLoDCl+usqpV2GcKQBvb4D3kXaRBCTHoY7IHfGrRl7HnfUKMbtcCGmtcmv0M+RQJyEJZFpOs20ELBCuXISww== 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=p1QWProJqtaBHlPXViWpgAd5dODgg1uRSXQXdPrb3fc=; b=fw9xpnu/3L1IDUloGlO+7NynFU/LahCC40Ynz2eiEyKe2zohJoJRj+4HVN0lifnLOGkyfTT/FEPJEqMa3oYkYlQ+j/p153K4pwVkpe18Fz6xXqbWr6cEQ4NveLIk7SAoWzNcj6qkPG1Wc0jCj7cjiOlwhR+YtuaHD8k6R6v3pT8GLOlwZeQkKMmtcnrIRTGhW1nGAaXpRt35blmIPwAt3epcW0RNPTvSnddwyqPaDQgDfkPG06/O4Bk18JEsTZIFO2PC6wYALGjYsBr6xWAH6KVkCtOpidoMmYKyUSlpDWy2wVsMuDnKe/3mmmDU68FeOWlfUQXQ+6L2U9xhOYjbwQ== 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=p1QWProJqtaBHlPXViWpgAd5dODgg1uRSXQXdPrb3fc=; b=ZtMXusxZKlVVghidgMIP/ZTangT1z827c6vRliPTlE5LACti8TCi82LsA9JRRzGkqKEGoCdc6WVVXKTodJeBxMcj48ZH1Nzc/2H7AOVMvOG5epBEs2UZzbZaWNzwztyKK/0X0DsZnHW1+qK2aGJHIuEqFZyAnOjqqZ8DaDLugySuALAvAyxVCxqiT+s6HDfDWR/nt9S7A9OQYpB7/I8P60mmd5/+s1rMu/ACNhcofLsy9dbKMdftti2OSc184qkK46mn9fWxch8tnVy1C2aqGfqRdEZow1o9Z2peUozZggpMChTfqhaRA1PTqc0J2qKPBxr+pzw6rX1Kc/l9Pa0eFw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:36 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:18 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Acy/dAibubyPPw0eM2GWu5ELOWN1iQEU5dvsUP7HHD0=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: 554f668c-f02c-4db0-ef0f-08dc5143d56f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rU43lIpQrkwUrcHiOCjzwpqN3oyn4gzjV9J8ILtr2mM4FLcb2Dq3Rg4Y6RuMQqf0vW89kIX4nAlv2lFiVngJrVQqu0b81D1kQf6q9oBf/jvmiJLna86MsBkXyxdlb54gHdhs6WKjrqkNlJgNyo+aRC5tWBnSMrJtURqtVE0remcmN4VPzRrCZBzlqSKgg+DQPi5wVhjPxX4FiuDsfFfTJPMLxJr14w3SHS1LwdpNh0js34h4r/XJ9rYZ+4LeK7EqUA72ezQ+nawoiJN5f2t95mzFK5i84q2au3NFywR2f8jOlMN1rqjYzxhx406a4oKEjEwVyUDjNHO+5ip52S/u/ooceSNA2I75qn5wT95k0SqFLYrr20JSy5U2fcfWHdVhlHwrG+U/m5a+EYjwg2VJ2SQszq3jmPqnC7+HdTPP4DcN0BeaMsPNgUoPhJQJgGqvY7+L49h/xIhyjlFnA9I3ItYYMQ/EjbiSYK2av4df7x1vUPUgdVATka2RSyiDvV7Bww8WP76qXcUvx0AFzwK2fX/YwgaGewb0AszkpHNzA50si5/XTcVZ0MoUGDlwGEQ1fDJgk6fiEXYDxEE0Wu7CZHlDXqcmOPi16Q/ATMOTBH6UIfpJEadPvPBdOZ4pNIt3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xfJ23GVIEltvIE557Lx8brtF3Gu0Kr7RJmp1UVlkd/DQY+xw9MHGuy8enHLmoCUpXqDbTqPjGu1mUczpoI3fIt2IYUC34+6rr+FXj7OYHNVkSwTHqme/ZwopYO4DcKY5EsDJUfadFIx6yXgqJTdMZPZXRgSh2CpEr0hOUKlPB8s4K5iT/kwo+hamNl62klWf00L0vq45vkA6eEPENZnC8GStZXdRABEGjXjSDl2wQ/t3d3BI45gu7cWezbAygdwYF81aFLoxx+d7RRz5yMtOYiCtjvwvjKubP5rdiO+dtk6dJ23OnXQY0DiKFUj8ZDAB+43bddLx/UnGKTxfwAD1O5y2Lw1kTz4m8F2JiB5XiJy4BvIHkd32tZUG1TUdjfeYywe28GC9maGLqylC7aWABw6TGxnw3TGENx0kNpW4e0/RjXnXTCpKAFFtH+jadggSLe8D67cCwusrubPV7kfTNYjF+qTYO1cBenRX+O2pbhoc94NwkZlh9i2Ro6t8dDKDIxeKLBtIp3XI0BDe7kEBxjGxLdkZeRgygNOcVTtrb1g33gjfoFvrcbisIuI9Ou73p1p59dUaSd8oIu10n4d4ZoXhRADhzHNfU/12o0OWd3m9Su3zY0YtXAhf/kqfysXXKLFG2LXuHM4vVRPGeVPXWmvtMIGL63mrKD/tt930A+9jNNk+euK7IO/xJJBa5Je1tP9+OQxwIOnWgHr3K7NQ5nfUAtLf/+21Yy/3cMx0ZSpE8aDcVdV8yxMvr6W9yWWngkhlSOprowq1i6AipKgiQpaNkWE87lyop/VvZp8wrctlM6pkkFEtC249LvDciHLQyvqSU89Ga5tLPkhgTveAIQBNjLeLtF+6p+yMfMyKqdalE402rvil65/4Uh0V+kSPT6XCN5raAp2v3S4IKRbPEiUaakYKljOx9rRFeHy+lVVxCSU88Zslp6GjaBvVt5rXf5dsWhsgEaBpyNfdrrv3qkmPrRzisgXKd1fhwajS3aH5vznmx+VXB+fEf34Q11tmHzuma7pgSY8AvFhu0bglFT3YKrrBXKcsDqgFQWit2Sr8helpDzTFyL399w/6GG5e3JEe0oPEhvuciO9JyH6sxGw5mL31Y5ftFKNKYZVcAgmAZHbp1CbixBhGyymlqNREU8QxkLAGje7ypia2NkgzFsl1QQg7UfQJC3sQNzyHUvrALjyTWjRKl07Z1UX1teylCV6vsWD9BFJy+f2OtJ4g8tMeLZIdWUgn+UJlDrf1MOo9zkeMPIwVX9DN3zwuBtWGIXOIwJuShl/HBmx2cGhRjw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 554f668c-f02c-4db0-ef0f-08dc5143d56f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:36.6970 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 05/10] avfilter/vf_swapuv: Remove empty options and AVClass 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: tyKRtk/xJNWw This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_swapuv.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index df04631d20..7965dc5dd1 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -23,23 +23,12 @@ * swap UV filter */ -#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "formats.h" #include "internal.h" #include "video.h" -typedef struct SwapUVContext { - const AVClass *class; -} SwapUVContext; - -static const AVOption swapuv_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(swapuv); - static void do_swap(AVFrame *frame) { FFSWAP(uint8_t*, frame->data[1], frame->data[2]); @@ -104,8 +93,6 @@ static const AVFilterPad swapuv_inputs[] = { const AVFilter ff_vf_swapuv = { .name = "swapuv", .description = NULL_IF_CONFIG_SMALL("Swap U and V components."), - .priv_size = sizeof(SwapUVContext), - .priv_class = &swapuv_class, FILTER_INPUTS(swapuv_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC(query_formats), From patchwork Sun Mar 31 05:31:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47680 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94416pzb; Sat, 30 Mar 2024 22:32:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXqf72640Eo9v/4+MD5H5XIfrRIVRaXJZDhcg1cDnP09VD2zHnZ19H/ESnPivbtEqx5RHoe9INoq2+p9XarDXjA/OUNHu3HLSWFrw== X-Google-Smtp-Source: AGHT+IFdRxi0LHcXHewbpA55mIRbiIZ2eAaN1FhLBwJDzpLo+w/nCSq3uwUmgonf9lqjcd+pbcmr X-Received: by 2002:a17:906:6a24:b0:a4e:48d6:ba1f with SMTP id qw36-20020a1709066a2400b00a4e48d6ba1fmr3115244ejc.55.1711863125892; Sat, 30 Mar 2024 22:32:05 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq16-20020a1709073f1000b00a4e30c8c0a1si2468532ejc.219.2024.03.30.22.32.05; Sat, 30 Mar 2024 22:32:05 -0700 (PDT) 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=gvDkfQbn; 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 C3CBF68CD4B; Sun, 31 Mar 2024 08:31:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A71AB68CAED for ; Sun, 31 Mar 2024 08:31:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BHsmsdNxRwcV+cKs4Lo3iYVT2Wx9E5MAW+6/lUJBOctJWCzRN6oVRiPwD2gzmpE0QsI5v+fl1HazCFHnuzL8E2YlPLGHb16fQwsb1vewj8hgccN7sOScmeiQ809qnm5ruESVeaUTjgTWil41sX3ijWf8lU7ZESBvKvjRsbMWDMRPpr/P72rYM8gE/EdA5ckV8XEaL9dfPM/32O7e/JBOcf6DfJ9JB/BO8x6AvdZmcLhythBbnwuTnc7jz3JtYYehuTHherLaCsUXHwTJI2Gc9/Ruu/zhk6jOchwKSLosTVayFZan+If9H/CzSDaNTqk8ZfqVPwNRx/4jUOTX/aDAKA== 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=+sCFabhRFgymHINIaHFyDDDLjwYcITY3uCN6yjk+Ek4=; b=VFfNWK4fxS6MWLVgN75Z4XEaBxytwmgXyugw5gkIDHdkEPD0+xkcSOMePtTHgf/4Alw8IPhwH5+ywOBOEQa7FpBbC19xOSJFhbo2+mAmOKU4N3DF4gJ/t/WwSVqg67G6QxdVdQuoGRQZm3Z1KAEgV+bCXwbaiF4L0Vvonbwn+19FSN77VGaCPIwN2VKmqJUaM0EILcHQPRoNEuWP/ObrHAsQelYAKKpuFGC6rTjzsIanWR7rAbuN8fflC5K+Vy7QuSsgtXn3YDoVxs1bxtM+FqOjCMszFBt+rEL4mijzw9LeV5TyzFKgByLCLQEJGmyZ3m7GwgzZIPqcowRall6B6w== 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=+sCFabhRFgymHINIaHFyDDDLjwYcITY3uCN6yjk+Ek4=; b=gvDkfQbndUWDJ/OxtrGOwaT6OKYxJ0U+yg2/UStDQURQpX/Wzbyx9r+rGsk/ogLqLQajHnu5VgNieAucRGjzl+5anY+cB1YplVaWeskQ31wlfV0P7xhHxTbPPkLn/778BnIH0g578b9h6ZxlH/DSb8MkCdwpzvkN+ckF08v26F90k2L3FevD97U238Nz6iJ1vkikCM3n9+dIGzmoi1X2UmW3TfKwqQFFq8beounVtNCM2nyuuFc3bhCxeVyDr/On9DmosZWRDrSTI/vWFO4w0nkhAtg2MPe8S+qgOzZ9ySCDCqHDCC/E8Z68HN3PYQPsYv/H2o27vCu+T3yBOV1cgg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:19 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [fNeXRDLEeuMiHImKfH+Pf+awX+YFNjRawPJfSNECgXg=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b9f14ea-1083-46cf-dd1b-08dc5143d603 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ONm6TSF5v2DD/8bcyUmwttWLSjWFiUzRH3KrjiVxlzppRZ1uaf3va5cUWSzP/dr9FysStjfZs2WwE04RKDnvAFHBc0fkFeGl9jYYbQ5cxnAq+sYb/bqcY+c8pbfQKhR2VCf5E2qz1qhcNoCSSQvHRaT27EqtpHwOCujAIxVSVtmzdHTptj+QToFWvemYAa4bNOe6de/LLxVROa82isEtHtqEu5aTvkmium80DYjTbCRXbYYL6DGl+QPDRmRMAMr7/yM9m8kSBWDkx7XhUqPLoMbUrNa9vBqn+Me+b3cczNogjpIsdaQ7ucN+FxZ5k5bLSxKyvAPTZibJNj2MZhJFfforrFJJRY+BYX8ZoTubLrAOErTaxi3uNmWA/9uf1R2UvrXlofhgxwMTZIV6BR96OwDLZeyWmN57967TQX0RSkKJsMy07swAw5mXMIPBrQOZEWKNj9pdVlTcCq17WGnviwZjoh8hSBWeNYP7ih+Zn6GClSvduNBCFFEsFCwiioWt+a1Y2wJHK9RaQ8pNM1mSvG18i0KpI3gXelbyC7XMVNzAw2X44Bdv4cwuGj3BfrZQljK59ZqEJpT3b1qIkviS3mhJpFQYTrHmcc9nNLpdEg/6NgHIAz0ajuH6knZszK5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Mj0jyiM3fJd75AN2OM8J7je4SoFhCebY2/uul1wXlaYw7no21Kdf9M1jplzGoSJ0dYgEeBJWi9mTnB8macVjhH9NU/PKcXC4TkUoqYDci0qRWPcTTt/dUG4h503/bCpfwnlL9IZMuOG4RcgLY215qlq+DV+cX7XzyEvs2wZV7Rs2odVgRghyO99GsZzYRudN7Y7vPRT/PpsEy6lAsCrCtPXwRnCdJp8Lw7piLXnNVxDbEklJBJ5NmW9pj/BnQmIqnvtK9uH50MAe7fKbpl6HyOVI+E6qm1KqKnIv8rUcKmgc2D/hV5U/ggF6UtW6Pp+w9GN4sWlVOsOgFnBO2U5kGbK98Fw47cSXc1NVXx/vNoGOi43KoKaDbZ8Poi5PAMP/3uENWLsHx4ESPhS9J8cM8DoRH46CikJWlSkAkly+ggpaUwiU+BEdgrTFPYTYnIIhpuX20JS5eSnPePF5lzemScyaopBQe4FDaJsCTq6OnUXKmlLkCp7GM4CkpHf5D5bkIbuAsthTBQeCj5YG1w3R3KBT7aC6fWzxeJe+b/C9DRSdslKGznP5TTzfPW8NuYZPKiZ8g6mEVN2Ysq6u+ov8XK+97QYpr57CkTBOt/eL/uiqa3NYdJdZgMtims3kKes75YfcUGEYGMyFwp3l7zKvBMGbpeEKYSLJRFRfqxGN6NJLLaxBvdVh6jOvm/+QV2x2pw2dyy6zwbdjtdxUXUdPLRfJQijntmdzOHPE6BBVBNl3qLOy0s2lHliwz2v1aYju/jnrFscxJeWynHTJ8RKDqv4usihGCTirh5Bdjr9hn2DqSFXHghFhuGPhGbKrJ+axzbg9Cvt6Nz9eUyOQ7ZRfcvaXen/Z2Ily+XwEsk1mNQ3JFBfOuOu3wX10Q448QuRfd9mrHFreX1RN6QexvKaXHAe3w+mPTlvVBKcpT7YfYe5EICVFtIl8Tm8X395xY0PQOycJ52pDUOu/H1ZnguWCIzHzOOcalbBBw+yQBnrw8D6PL3F5C+GsAKIzQ03ygAxeV6+Ojs1SHGyX4gpu/1LrSQ1t/T6tOhOX9OpynQTmGXbCX+woS6/OkNcA+BFv+IzEiE1lZiHIwLXFTn/JZTmKo/OKyBNH8tE6J5O2XOSi+TaaYBEr8bZhf3n0BVzMXV4AVDlwMGq7IurKwEwzVStEPL24feSi2ScIh7jHGl/IGDpOfKUDHV2LUPB8mNrsogZ7Nv/KH66vk2lS1/masO5gU2pi41rXUNWqP4e3iwnLTt1i0B22kM0lTMOM1IuKkRFSpgy+o6yZ5/SIUjYP8X4IA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b9f14ea-1083-46cf-dd1b-08dc5143d603 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:37.6839 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 06/10] avfilter/vf_vflip: Remove empty options and AVClass 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: H4F6NC99HPhU This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vflip.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c index 8d6724ed37..d72605bef0 100644 --- a/libavfilter/vf_vflip.c +++ b/libavfilter/vf_vflip.c @@ -24,24 +24,16 @@ */ #include "libavutil/internal.h" -#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" #include "video.h" typedef struct FlipContext { - const AVClass *class; int vsub; ///< vertical chroma subsampling int bayer; } FlipContext; -static const AVOption vflip_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(vflip); - static int config_input(AVFilterLink *link) { FlipContext *flip = link->dst->priv; @@ -139,7 +131,6 @@ const AVFilter ff_vf_vflip = { .name = "vflip", .description = NULL_IF_CONFIG_SMALL("Flip the input video vertically."), .priv_size = sizeof(FlipContext), - .priv_class = &vflip_class, FILTER_INPUTS(avfilter_vf_vflip_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, From patchwork Sun Mar 31 05:31:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94459pzb; Sat, 30 Mar 2024 22:32:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjYbnDTkxioBA78rMX3ZXurVRQ3T3ckgOrBh82g9vzNO6VTAqaxLxgTc7kCgnKZADNU7roLbYJlfIId9EhwLwzzt6vcagE5n/7GQ== X-Google-Smtp-Source: AGHT+IEyE3SsDQQJgtJ8NbiIa4Hz01xtxHY4qbTD3ddYhTFlJm5Jp0+xMMhHzjSQQxQbkij++NO+ X-Received: by 2002:a50:ed01:0:b0:56c:5a49:731 with SMTP id j1-20020a50ed01000000b0056c5a490731mr3926894eds.1.1711863133800; Sat, 30 Mar 2024 22:32:13 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w11-20020a056402268b00b0056c3f3852e1si3388664edd.404.2024.03.30.22.32.13; Sat, 30 Mar 2024 22:32:13 -0700 (PDT) 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=YcKu6UFG; 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 426F768CAED; Sun, 31 Mar 2024 08:31:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C18BC68CC5A for ; Sun, 31 Mar 2024 08:31:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y+GDhiL3WsMIvlifVYQMURhfsG8I/hEzdxsM//iNNEriW0HLtuGpQys/c4FUzdncVl801/BmEUOoEIkH7aHrZ0dvAB8dARPPaPJYhyhL2F9bDEhHn9TAqlcRRLaMpMBXRBIQCuy+efsDGGcvVseN3rfJnMxJLfKcMM5TaIf0rqR7SptGMks8m/Wd4EwnCXNyuoAEVaJ9idQEcQhYUNq/vFvS7w2csOp7dM4OxSfGv+B5f5e2sv3o/PwKCrB52X4vQFpRWIQXoJlbC268E7nEgPVLCmawqu93/6iobGsJWy9dCerXe7KWbkfMg++jW2w6K8TH02QfEfrR/pcOGRsdHA== 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=nag54S20QP1QunSv7FqM6dXEb318wSVO6+05WT7dbxQ=; b=eKbrhs5WMbF5OOdr4ntatFehR0ukbVlRe0i+DuBT5qDsjxl+CtZJuAal+YHPP26+9mNh4cN70WnB/swhGby33evKhSaX0fBBaPMBgowcWt7TBCGqwzhyf3Ee4q87rFD3iU0AUEWqLKPxYdVkyIihY88bm/2tdxICcaOv+zUa2/S92NA+4j/wfFZKKWD9gxyK4NA+F57AsHnInj5w6tj4On8Jq2dKsMHrqJ6/LQwtWvSfdYf90aXVObAkNWKL6Mgw8v5doCd/XELLO7eZk/TZVRN6Oe9nqP+7hVrGW0gORz5I1GCXeu1yW4L/tvxQXuQkleI1vBbxK+OTgF2rReuPLw== 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=nag54S20QP1QunSv7FqM6dXEb318wSVO6+05WT7dbxQ=; b=YcKu6UFGmAiQYkYmphnMTeAqpk1oufqLsJq9Mu6rZvOzIgCXnmaXMvSSFGbYKUP6eBr42Z/g2pvY0+n7IzG9M3rNiLLHGDdXJiUwQBBu3uyg2TdJ01NIOGsKYVI1jcgjnq+6oaFQPQcWFRfXB28kuvYlT4siJZYY8PIPzuNqwpJXiQ/wWQ7g9mGPIFa9A+lwySXBkSLSQSevvhed1F9yeCVS35rf5d1YXWDRUN1gOLRCk1KcTiIITD02lc2Y/14neCQ8BRQsPaxUBgoNhj1mgEg72UNeyekEAvQQIkuFM0cRGeg0GYyOmzfOZflsDNBH5TNfKylnjO0otZ+DVTpuog== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:38 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [DCSSVHPAd2GCOWOSeCWFhmdOo6Xd6rXjYvBsQ2Ekzyo=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: 8be98a82-18fd-4bf9-1843-08dc5143d6b3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qwf3Ks0UcK3ZoCwuboaOjx0KZqkMK5mg6yYKgk9xfR3P4JnYcbUcbcrRzTudjzgDdPHrDdOzLrHTbgVGu1iJKl2Lc5wPFNvWN811P/kHfRUbmdGzipPJk9JWUs7BgWFsnHlmoEBhwlYY0hsbPx7blhc7qdD+eLE5EgOox3DZPz9u+2ZVjxG6GGFuuMXBkAlTTNikZ/u3lRaPzkm9z2N9w0tVeQ//IQ6PmcyoB0ltjBoFrN9Mj7EW8twXIB8zpqXM8cWn/148oz/9fTvZQiZgFFtX2yeOmnfezlYmcpKkJvKA8lsN/BHbYcn0lBey6LOtJkPbA6xsqrtHa7s7gEm4qVyj5P+dFaLCV6mMPIJ8A7vG+d8X1I8kevWKIWfA44or6XoE1lZELd9dbOdroN6Hnmg843MwS7l327PuU37U6xlExFIuWxTJybHksXpyusQOPX/dba4uXEk5LtYWfE0xWTbIHb9yhD3eVcv13COKEaqco4uXX45P9MHcwxfpcNFZoHwE4fds7Cfp+TET2EtMMUP6dNzefiWD2t55f84pfaHR2VXo/yG/FFrJqSe6IS5S5Bqbo1vqsgffMewxQnDSqX8jIwxpaH1TbOj4Uvygxl/2pHigDNAv+wb5He8Jlakx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8Ict16KkpwIwg8mgRRIiGg5uj9rfZqRphdxbA2pWy6MaqAo3ExKVUr9mLacdLwTkawlemvrjlSq7Ze524ZqwBbi4PtQtFPcHbeHdAr1OeMduk/ggLBOs7o1PsU7cZxcYOAWZHqEM6xU+Coy22CXGwdpzrpLcHeetO765nmL99WCU0pppchymCeIRpukB7rYlj1Rz+Ly5TzuGyle15U0MyXez1De4bHrx59jK1J5cOrpI2IvVtxF31oGwNeMTbUUGEYLhRyzYg/xxPiH+rXK7vkuRXGdasgGH+bBABIziR5Myflbi9ImKWj1x0N2mdGXirtEEdb5VxayGgM2I+Aad9tdaR7h7TlxaROFY94gELhPsAdopMCvMHfdTvomSc8tO0alMfwJT/jhKcSC4Mb4KHE4CiW6no0H+gK3DNWsqnj3XN5z9dkyODhpVS6gWemo9nZFTotr97ikiGdQTyMoHl2CUKXXPmRSJP78YTiV5YEpq6ac3AZvHY8+mjdNpQWgL2DCHFFqhPneEbDqbUp4ifi8U6HH1PTbpMIYnJ+37RVAt4o+iD6m5CcGrrBztvz6p4JUZUQXdNqVq2sWM/i06J1HkadApfKGYosHHOoKQCZsAYV4NzYJCK07I+thQPNThzCy7J4W4c9mOeY9CTDXeCMG0lZmaGjKmVqOxSvOH3s9aW80XryjONmbsJK119ZMFJjhHoEZd4Mwx8J+QsObQho0UtDIs4Bpg2SrvhAlRvUDDISK0oJdprCp6jU2I2ewnOIXRbL5aNI8YYgJVxSRCMgxVqqA+WMPJkLE74fmBvcWaDzd/3aNyDWDTkF1B12Jd6S8sxgl4VQgWuuOpQGGyDlPS/zRZRQTEI62y3zvo5RcIvJArKCUUF7v1pAC4vcrpedIQnDA/EJ/wGn/yQaln1aC5+I9zXCvP4xcAO22VP5UCMGmzmN2HuA9al14XIwzBCWRL7Kbs4NaZWaC1vnzAEQ2pNj4rqTfDpJ/7T2d5o5tqg1BfJk60rbCLkys7mTZWp3wXyz/gU8fmHqTRoU9XlAqZz4rNb11v+KA/NM0vvKrynnRE/QdcFpDgyFvTQn/sO6/5Z7AbsQAJOvsMiCdP4ONG5Z88OjKpa1GpouWOIW2cMbOTdtpSsT7r77kkdviV5xgF+rU5QPmxIUKDfpmR3jQECzoWGqHR/Q8xPX+Xn9P1rWNMDbxDsVmgg27zOjyJUpKx/qkROjCs13ognnabfEAX8Gb5usNcjwsG2e0WYP6Cq1BgGveLQQiRvsUCAyNLbIhxVq86bnCRZPrzliEFeg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8be98a82-18fd-4bf9-1843-08dc5143d6b3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:38.8278 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 07/10] avfilter/vf_hflip: Remove empty options and AVClass 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: VU7PnbGdrQIW This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/hflip.h | 3 +-- libavfilter/vf_hflip.c | 8 -------- libavfilter/vf_hflip_init.h | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libavfilter/hflip.h b/libavfilter/hflip.h index 8532dc0f46..0d8b1025f3 100644 --- a/libavfilter/hflip.h +++ b/libavfilter/hflip.h @@ -22,10 +22,9 @@ #ifndef AVFILTER_HFLIP_H #define AVFILTER_HFLIP_H -#include "avfilter.h" +#include typedef struct FlipContext { - const AVClass *class; int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes int bayer_plus1; ///< 1 .. not a Bayer input format, 2 .. Bayer input format int planewidth[4]; ///< width of each plane diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index 09f4e08ea3..9f5958a392 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -26,7 +26,6 @@ #include -#include "libavutil/opt.h" #include "avfilter.h" #include "formats.h" #include "hflip.h" @@ -38,12 +37,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" -static const AVOption hflip_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(hflip); - static int query_formats(AVFilterContext *ctx) { AVFilterFormats *pix_fmts = NULL; @@ -155,7 +148,6 @@ const AVFilter ff_vf_hflip = { .name = "hflip", .description = NULL_IF_CONFIG_SMALL("Horizontally flip the input video."), .priv_size = sizeof(FlipContext), - .priv_class = &hflip_class, FILTER_INPUTS(avfilter_vf_hflip_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC(query_formats), diff --git a/libavfilter/vf_hflip_init.h b/libavfilter/vf_hflip_init.h index d0319f463d..5c1d69b2b6 100644 --- a/libavfilter/vf_hflip_init.h +++ b/libavfilter/vf_hflip_init.h @@ -26,6 +26,7 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" #include "hflip.h" From patchwork Sun Mar 31 05:31:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47682 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94488pzb; Sat, 30 Mar 2024 22:32:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqUHAFWCm8ewqVpQBo9TEJdMCq1ogalZospvvTJ/u891vbBc5SHbgtHE8iu+7tjq9xcQJ2WQ2hhhXgHbeLXq00JLOgzjL3IWqFkg== X-Google-Smtp-Source: AGHT+IEshqdGLruVn3D1m9HkyjiCdZBuNdx1WYe3qR1GoM7aTR6Le7XBeHez0SSEYIS0VuSdcsAi X-Received: by 2002:a05:6402:268c:b0:56b:7f64:86f7 with SMTP id w12-20020a056402268c00b0056b7f6486f7mr5660083edd.3.1711863141728; Sat, 30 Mar 2024 22:32:21 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y17-20020a056402271100b0056bb554e345si3455652edd.447.2024.03.30.22.32.21; Sat, 30 Mar 2024 22:32:21 -0700 (PDT) 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=GMXFg5oX; 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 6CB3768CD68; Sun, 31 Mar 2024 08:31:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D93CA68CAED for ; Sun, 31 Mar 2024 08:31:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kw+Lu7s98hC0pWVnOvMLTxQHg2Dry3UxTKKodQh2HNSMiWiOX6GDR54U2liRR8GfgMiqetdG8ijOWLeo5QaeAF/tci6CEflY5TPQfHQm6ZDusYV6z+uq35D47Koaq/y+ask0wQdvX5AKaxxBy09dy1phvQ/7o8QbOsrb9qjSbAJV0QCo2sfEc8OX8rSOBRqc230C5EiAsN2KSVpkf+abTc+kh1UIeS3/KoCkAGBuH+xuPPJDUR+nXgTcuYq89ZUmbtQ/pm+m1sshDa1oiE6xzZJ+3jiZZ1LKkpjySaZGXcUH57HWvxCTjP9QnUXoC4wXxCzHJRN9mS+vLceT6eBQjg== 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=IKw/Ir3UKYBQgQDKM4gGhpeMghizBumXJ0LO1aNrh8A=; b=eMcYeF1pzQPJOJR+b7sRqkFN/wZzkW53qwan0PGKsUp6oB9zLM7F3II6i02D2GBFaq+uOz1/i2g7marhxbus+xpAoMr42aXQs0Il2Ycok07ibR+yQYaQo5QLUB1X2pfdjhZnKiYIOf08b1ohR4b0koi8hoJHfaMl4zAn4kslc+117Xk0tQx5Qz0IvJx2GS/Wx9bNXcyH170ZGf8xdRsz9eqGWtCryvTG58eHY5owf48lJ2FONOZN4ZbKOlQDdvaxo85FSi63r7I/iSYxOv8c/RZVkUvP6z3uQf38iRAvHvFazkL0oFCHsKKPscVrsXL9CAoYrhcA4Jl1xbmVfE8r7A== 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=IKw/Ir3UKYBQgQDKM4gGhpeMghizBumXJ0LO1aNrh8A=; b=GMXFg5oXQ7Y8ZsWROMyLIhfS9qZKdcoxIDo9mBbUEmlfWF8bHmh3wDsrKOGJ5vldKkYprmpOkDoE+e37leO3uGii6+WODRmNyAqRoYlrLgdEhjvOLA76KwGjoM/ezvD0F4bO1pjcR3p6VxGolvtVjk8VyBYof29zuQn8dJHWGTDOqmf5+UjUMZrehFYPZ9nRyu5o7rCma5PKvp9dWmOWLEF0hGWpKp1V/+NM1rzeKQJFp46mcZYNzT5tbzjguN958dsoNbKqSSmx4JIg6PXQQNpoEIZLAA6JK5nKZ3cu7SANgBdR+qJrsElLhj6TXeGdfo9UOZEK+nc8fsimqn/kXw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:40 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:21 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [T9b/zvCeU//ErmTWVppAghhr7X88FiMmf7KRpIUqjRU=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: abfd5867-67c0-41bd-8a99-08dc5143d740 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vXAq5dblODQLkarifjaOlAHB21bRj7sGWg0OARkoItU6ZEZy/MypD2KXfHHk4m+FG5jKj19DBjDr3coG8PXkJin+eET86PV6iN1PXr+ccABpPjM/jv+oseVqtEmTC0q2srITPnxYl2IYr7/Mar9upVmcMqHk7mfsc6qQWKssJyulpdwvxwYWREFfVyCyUH6Y6MS+9LcYaLWSaAO2YihqzptjUwBtKFPaxFWK53vhHIFcSaYQO1Zpagr8G4A2Wq/4qKpfg3K1dXdAEmN9cd7XPlRxXPhE00ogdiFuDe5ByP1NpeCWSeFf2Vqo2GUOM5v29epd3akg/PKR7X8vZ7wjj3naEdnt9QS1KDoEs2A8hvFAY2+wElS4UGWy3z2TS8NQoIRGhAuR8GbR+4v/7C9R8YhXLBdaxDpw1JyLrrvEVGDuZVc3He9bNsM8dTSvFY8672UtpLx4z03/bFqObDKHZem5BEWyLMVs++x2Q9yhALDXZ+c9CNTASFSYQYURsyGg1Mf05QLX1JObBPLc/UK8s/fhXkj2sToypMQ8tVyD7NHou7qmkWCKURgAf6gW+FXV8iXauzONw1pP42ugf654GEd3W3G0K+e8Apur05eQrWvvHE+26Fr+bKbUyRUFDU64 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Wn3UBm/cI6vhdY4no2eNnufJtVzR6dHL8ke2BuVcNnDkq1HYZG9pJ7E6PEzojZd60ntQrQcO2SpDgQDz+fnKkU6NLLjvc0iIZ9eY0OHGqpRXRQLk8rJ/E+S7h+rSofwY30yBp32CC/MIY3ItjCXFZ1g1n+Dc9slgnzZV3Z13JFB024Jr8N99uI2vB7unHcb8QBZYuCijgFB+IKHnK6ZBJCz0wyMsnvk4d40JPNFfmP5J95sCsYCXyRdQOjqvnGVe166LOFt/8ndGxB2pROrnaNV7lI9qPQG9bTkpfWB2WiBBZ4VykBoIJw26rP0aiNhq3d0YgwcL/20sGtC0wxa88PtpaUL2U9PQ4IJB30Uc+xFElH9/+Tcag2NxYnIYngB/DV8kIs0y9lWxEJNtHawpEczk4ZdH8Mt4cArdWJmkW4XNsdY0pGt0lhPoYD5d5boji6le2mUeZeOXgv/AlRInk6zDKDFsCG9fLynklCuMkYs24XhByBfCoHSAAuI98KaSs7x1GVLzzNXiC0Sp23FlssvaMnYPNhNEjmdGVknqHHYDH/soRfFKPjczlW9rdnEAhPRzOWFP+xAVZnYs5GGomE0x7ysTaP1J9fiGdOwFSfSJWVCn72RuuMiPRzHsjEPPhZ4l4cdJ5L13a1dEuutyVncaRAhWkIhiWe/bBOrvb+N+Os7DhPr1HS6QPXxUQa+k8YD3Wy3zWRfMVdsv93YwBvHOP5P5SE8RnyPxtb6HpKgzIK2kxgP6X4R9SRWjJmTRPKq4s+a7CFZB/k4IvHjK3K2M+/noRoeMKhRBHbl/i8WU3N9mni4ZqVAsu4d+OqapJssCpEzHaSriMTBEqjvRfQG1OP5FmTMIxIXcU+KGQmSfpVbAyThYxKR6oCxk529srh6aW1gazVy2tPjq36rJ/3f55SqGQlWTAIGfzMi8zPXWxZQbhdaketyA3LtvacXRjYfF0/z91tNGRybMUWNJHlY5/4Ovv8hEc279/kbxEqI9nmIR2Vt/ymVsc50R4F8jxloMfpH1Z87F2dC48WyN4HHxNMz3/tptqwOClNtL05zGsK6s+2lj1iuNVNeWxPHqyj3F/K0E0mDF/0qEBP4CsKOrRkpmobHM7QlAZFNUNGqQhoiWHsKVW7kK5c4joUlxcdPL2lNZPjvMZBVwkQRjIULPROSFMSGqfP6/UsFjq9UDJJZmzvKPAoxjzdVknM8RlIQ5MaowXkllNIghSchPXVCSmqLhAhie8/aTCH7KnITb8epLTo3gGVkUhHayHn5v1wAQ+uUXqkBRvwVywDSMmA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: abfd5867-67c0-41bd-8a99-08dc5143d740 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:40.0100 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 08/10] avfilter/vf_grayworld: Remove empty options and AVClass 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: bCMpdInv+mgn This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_grayworld.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavfilter/vf_grayworld.c b/libavfilter/vf_grayworld.c index 61ed832253..0b6d673168 100644 --- a/libavfilter/vf_grayworld.c +++ b/libavfilter/vf_grayworld.c @@ -27,7 +27,6 @@ #include "libavutil/imgutils.h" #include "libavutil/mem.h" -#include "libavutil/opt.h" #include "avfilter.h" #include "internal.h" @@ -41,20 +40,11 @@ typedef struct ThreadData { } ThreadData; typedef struct GrayWorldContext { - const AVClass *class; float *tmpplab; int *line_count_pels; float *line_sum; } GrayWorldContext; -#define OFFSET(x) offsetof(GrayWorldContext, x) -#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_RUNTIME_PARAM -static const AVOption grayworld_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(grayworld); - static void apply_matrix(const float matrix[3][3], const float input[3], float output[3]) { output[0] = matrix[0][0] * input[0] + matrix[0][1] * input[1] + matrix[0][2] * input[2]; @@ -311,7 +301,6 @@ const AVFilter ff_vf_grayworld = { .name = "grayworld", .description = NULL_IF_CONFIG_SMALL("Adjust white balance using LAB gray world algorithm"), .priv_size = sizeof(GrayWorldContext), - .priv_class = &grayworld_class, FILTER_INPUTS(grayworld_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_PIXFMTS(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32), From patchwork Sun Mar 31 05:31:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47683 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94527pzb; Sat, 30 Mar 2024 22:32:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhMs+juBRIHSc7wvII6bdyYzlCXgzaaDwLCnIpnzjvJgyQbc5uCu/E/8Y2Ije13bMKE4k0R0JcEKz+uyx4Tgt8pwXjr8Y5Nz1zsA== X-Google-Smtp-Source: AGHT+IFRvqQG5aDk4F7cI5Y4xFT4FbN4VV0HPV5yBT5TcGGYbVik6q5c0FJ6zV6PVUniJKtmWr3I X-Received: by 2002:a05:6402:26d0:b0:56c:3b7a:632b with SMTP id x16-20020a05640226d000b0056c3b7a632bmr5034901edd.29.1711863150292; Sat, 30 Mar 2024 22:32:30 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r3-20020a50aac3000000b0056c0a47d529si3347960edc.84.2024.03.30.22.32.29; Sat, 30 Mar 2024 22:32:29 -0700 (PDT) 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=Z0May1cp; 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 79D4068CD84; Sun, 31 Mar 2024 08:31:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27D3868CAED for ; Sun, 31 Mar 2024 08:31:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QK73hC3cSE8oRTHgth7czl1eJQHp6/oEokb1pl3if0hPPNpkjAO84tloyFqqTtXixM836S83YVuImPTziLgU8oWu2zkayrfPG93O2pVowv65OH6K5vDOTWOypG24yep4twuArSZeKvl2dhrFSi/Xvp66gKCBmuunvdZFcDY1DlyO6vmUJjYfI5pKOZMbRPAiWLHpHhS9MpQhyNLsKZsLkU1TohlWmq98VyAa/NaVHD7C4ZdywuXmBVC+o8PL/CnmgRi+ZCsDrCrEsyfbvws8VkHefGrPVOGWpOGAU1QnYzVk+j0rE4DyNO6XEh/J9tqE6KnPbOrygMQAIfqvbc6DMQ== 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=MSgaONI951HxTBX0sp5jDfzLLGrSn5hTE+wgQLwbBDQ=; b=Enc4q0G7VIaS/QD/ZFoqoZnwuvfPB1rrnoXUBNklmyjgSGV6Eu0XSxXK9M9PXj8zXlBsQa55WQz6gVyNtAb0Bpw+x2W693tILjNDQhR/dGhFcaLRP2FPCVhHVVY/Xg++bzEAIMsLNc8QGseDzZ6NWHyWCZYaTEpodrIlh3zikNRXNbJE8BlMnpLQhbecZb5YrSQXpqdj4rwg7/hXn/NShFKwzxWPVRT1S6BV/2yfKrokGyJb66sTcZ36rfRORepbvMF4r4iC24R+pdURXZoNshhISyULmi8cusG9kqETBMnSrc8A2zlwTYNseXkn+ZILt4Fpb3ug1QS/V47E+A1JUg== 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=MSgaONI951HxTBX0sp5jDfzLLGrSn5hTE+wgQLwbBDQ=; b=Z0May1cp7Ql//nyNKnyefTIbHIOi8j5+yGiKBbl+MoSczSnd/1WrkIulUM21zhA9SXXkOoyCCkePcA7ggIV1357YG1aixRSYmhzCtBb3dC8V+ZCR0oHw/ZYphOEIzuPHxccOX7eJfTNFl7Avr3naUhcoGkZueNaCyRbudG2CHmVriqU2lv9PFhtuIi9HRnJDXqLYeKffwBcfaOk8P/CVxF8wwkizgmrukErJKglHL+fgyh9W2tRZp4p9rYVypirPq6bfqj+o0MSH7wUR8zmE/D6iYaNcpE8l4p7EbABDOp2ja2wfIqqV4LfFyD4DaTFECrvvnNgxBjpNJz0S0XvP3A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:41 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:22 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [f0cl9obqa4XSiYHDR/bZ+Cal4cVsxdPSzekHXWbOeOk=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: c0c8dfb0-4821-4ad4-f283-08dc5143d82d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3WcpnTUGtylERqj4dYWwbiMCmhSjsN5Rl/kwDvEZ4hZS/sqYz/Nz9k7R+X46991k/wP2vGaKup0u6Mi44ryEJTIWBYW6fbpCJRsqfPzQjI/RzybRExPDjRlq0O4YXrwe9AcGBw6uvMuZnvhvr2UYF+uWocQlYRL2RGR5Hyl6N22QZsvdZF5aA1R4wrBnNUJaxM+y54YgyIGwEbvf+jcHgg5WyXohLZ2gb4ccK0G7OB1FkG6NgLjMDEXbPPRpwSkW+XqvKu9zcgnZ0srnXd1bzA4kqOlxh0dWLp7wcNO5+SSxlK+nW3ts3dViYlYqTaKpkLLaSo3VzQGU7sEwtgv6yjqO8cwFSkYNq1VXmEw72ZdK9VDBii+8QrDlniLcklpg2BM7yEOLebl/uu/rUHWH1S8tk+BKfrQOugIKCD9XPNhvvKrU/NyGd8CWlq+HiE3TeCnfORYRz+EpMzyPoAqSwZbazLIjTeXebr5HzebmDvv04MnmbLycTnfYWpnaPd+t6PwezAjsYBijXEJ/a24ORBw2N4NmTqgI+XUqPC2+R3b9Fl5LrdSFZcs+wYnNCxl+isPo+VcLxFYRF9nCb3s+vAEun43ecs+UNUti/S98TVlXTcRzKXAJ9Zs6j4w4PJo3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WopK6/bgmVP6kDqHGU88bFHubtwwQaoMvxl1+RPE6yE5KSwAyDeu6NFUsQNYLHWj5oDllpYmekcDdCSffxIfAsgan33JkXxfdWkww+lBl450hvDsu2u/fQO2SCC+xbfy4W9qEuwN/pFxoJGD0KRkHi4uaZC4zFtL6pNfU33CXWRC5III2zaQWXvvrpZNDW1kw1Mni/3wvn2zDoj9lf0BUtMbfsD+aE1hrbicvrbh7EbJ6c/ZQba1oopZc5y6o/uHabt42+BSwZuOdsx/u+XTiUDnU9kydRE981PP56+rNoaBnJAAFzoOYntopeuktRHucNCwaoPFSqzyTW3pUB0lNhmICrGXVi+r3n7SJa9q1CgV3sk6+hABweTyh2+J+5w7tNp/gS3D1gCdMv7GuKsk2+UZSzs/GgRwBbdo9PDii699lKCEHIPkilRHnULcZU7HByOh21du/uEeUHUswi5dQxe+3YzovjxubJb9sQT5wsu49+ArZjl+nbcUsdZnOCj2HlnywwrOKI+AdKCrHwGRzmZ8QUJWaJh8ky6EuLnR4ni43sgMKvQzRDJ2RtWB8RgQ701CHHUrakFojz3L7Wkt8Uxo5WxKyd+VfZKf4cFE12HlNcid9q1l+ZH3hc1QPV63IuIAWkskR8xuHpwe7uHvd6etP80kWOlQQKBnHcn1asYkPUOJl7fLzAupGpZnYc+4s/EjMvwXM+T+KusbW9zzMvSgrUJwv5Xe2ack+Z4LSZ2qhX4v/xwhLY4siozPUmZAtiiuCHxp/cRfS4tOUB5cGNJtOAh2e1nomQIWW+icS+4O9OVS66D4JX0AJJPocx9MyLZbaSuorPRk7GxNAJNsfqVgvodxbpNZcS3gkv6SlG30V+3cJDODZP8RR/HjXtqoJngu9pJeNLYXhylIBUkvnjsjiXil4hqM7/ppRyp+a0b9sfouD0vBsUSQhePlrkkDpQqGgq2iW9GZ2HEdmPEPEjP1cmv+Co8VYhJRQFgjClV/9tISzpEZ/nVpdo7tUmHaJXuKTtG0wkNKHgeddoTxoIJj4DrWBnuGR+3B9HEHy8cCAwF85OhDjbKC/m7/Ei0ELieKwYT5QlI6R3q5ShpjrnlwdyIZWCQXDTOJMFyc7SXL5fS6QOpCpDx20kTjASfThDkjbssJZrGRKcbj7mDKAiEeg1/DnaalKVTojI9WE16XuiyDGXPZgfq5Lourp1VhA7N4LbCk8/7+72igTdfjXK3GSYdrm9dVH1NgSa7JvlZlsaZY8x/qT/KFnT2De1L7tBPNUtLoER1IP1K9RuNKLA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0c8dfb0-4821-4ad4-f283-08dc5143d82d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:41.3712 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 09/10] avfilter/avfilter: Don't use av_uninit 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: RkDjEkMQZqfs GCC 9-13 do not emit warnings for this at all optimization levels even when -Wmaybe-uninitialized is not disabled. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 21d6832deb..7f94e71fbc 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -835,14 +835,14 @@ int ff_filter_opt_parse(void *logctx, const AVClass *priv_class, { const AVOption *o = NULL; int ret; - char *av_uninit(parsed_key), *av_uninit(value); - const char *key; int offset= -1; if (!args) return 0; while (*args) { + char *parsed_key, *value; + const char *key; const char *shorthand = NULL; int additional_flags = 0; From patchwork Sun Mar 31 05:31:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47684 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp94555pzb; Sat, 30 Mar 2024 22:32:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFFE2iBpqzXNH/g9qYHpy8s3fOsrHf+/vIENy2Nztk2sw8pkAiC56Wjym0EzoqUKmYu/bo3QWWhVcjhC3WJ75i1c6ll8/WK+QJZg== X-Google-Smtp-Source: AGHT+IHECGaVanNwdcWsaSQ+ZslKfXb7H1bnij5AkiUNse09xTjzMSMULfrfVDa5imSHAJgA4g3j X-Received: by 2002:a05:6402:268c:b0:56b:7f64:86f7 with SMTP id w12-20020a056402268c00b0056b7f6486f7mr5660396edd.3.1711863157850; Sat, 30 Mar 2024 22:32:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 26-20020a508e5a000000b0056dc5c5a389si830435edx.502.2024.03.30.22.32.37; Sat, 30 Mar 2024 22:32:37 -0700 (PDT) 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=ThYvCBX4; 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 74E4068CD9D; Sun, 31 Mar 2024 08:31:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2013.outbound.protection.outlook.com [40.92.57.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F8B168CC9F for ; Sun, 31 Mar 2024 08:31:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nnBsk4DswVLlrmdSbfY/5X9kp6wexi+XmaokjLlX9LtjzP9Fs5tMJCPbDgF0esMjYyqtzlUGZoWlMiz4i+xcbRY0SMDMqocjDzN/b6zWtnr53mRG5c2wV5DoB5JriCtZ9HuX6LD5dYDMq/DvHa/INEiRxdhdXQNN7ZYvlItDYJPYrUG2LfJqB5SyrEcl//J1qghu4X3+EuPGl+YcryKQlr63PnyWhLJkCo3IM/YGeEQNjqsvtTtIh7lM+doXUFOiQalsuDThGMLHmlEPV31Bu/bjmlOsGvbLzSR3zoA/z9jTYwGV4Crx40Pgp5HPs2vpVj/QpIrBR3WtsNSXTGMriA== 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=cVg39M5goUaafgNNZ0/4Lbklxrz3X5BWGimBF1btOhM=; b=LK8cd6cukut8ql8v4KSbKLnQj1xrojk6sOVlB18dxhtEqySVt4jCmKHWZ8pKHtdAuJuaw5p928eQ1l4I35LcMKt1Z/piRA+YB8yFFlQ/WSzF75utctVysCY8ZRnw1nMhq988DjexVb12Z5tHaVByOjfLob5Hifx87uqknDAiZA/JZWWn9lvRsK/cAeWS53yN3JMGWMKBNFmd2E3LeYpMGDyAeT1BnxJWXVAgTJpVpDt3GlzJ0/9Z1RcVKUOlNju36bk9RCd90M3e0iR+XMTrMs/dwmU4AubzQIL8qbKi1vXx9UzzMUjB/ZC/dMsLsXhFZwj7cSZZ+iTyy1LHz4GTqw== 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=cVg39M5goUaafgNNZ0/4Lbklxrz3X5BWGimBF1btOhM=; b=ThYvCBX4fMa5/OpSu3rQS86H8YFHyv/vLJu+PxN0pxgLb1oa+F5Xlbz5IhzowFsu6a/uDh/6opLAeNC/FOffabRTmedJnFpU9N4wGA+W9qKNg3sOwO9OvLwbDHoM84eJ9kCKbN5N0+kK0pjcwP/i/uODKEUhERjA11PMtgcj5gPjNhadL5INEsqCdS291hjo5XdxlYTvExFUrqgQWiC81WXpDfTStzRQ8OTgLxqyout1rnNTefDcaj/MxjRhCLo+0sjtjJbdB8ejPuDWMf6EjOVttxY+IeqmBy8i0wWBfZW4MHClVVrtVfrghK8gSbWbwq9gGgp3yA6j/Mr3+PL4gg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.43; Sun, 31 Mar 2024 05:31:42 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 31 Mar 2024 05:31:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Mar 2024 07:31:23 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [5pLfVVVNZmq/hP8tN4R4MdIENLwf/CoygTtH81hqw9I=] X-ClientProxiedBy: ZR2P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240331053123.293740-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a070c2c-2297-4db7-df0b-08dc5143d8e9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i0jY8DihdlpJl58jWS8ecy/g32tGRK+8RIlh2Qlno2Xf0Xd7J5zjwdWm+yFjthwtc49+V3R4/weWEOeO3iIUaMF01aQGlDbWyUnrxTeVviVpQxJRkHy0+SzZTaMHiEc8TLHg8UutBLJAU4nstT6dSYuJijCEjPsVX8hW4ALLsgQkKXgHj2jJZHYCWjW6gYkZk4sG9uu5dbHw4+jAlzQtLMvgKiGfvB3o5SjNBOA1hBZccEhto04uuB93xTGoT6rQ3rSIgp7eZTZdKIl5uEyDsuieDUT4fKzsJlo3RaGNuDQ2HLjL+hwSI0F1uOZpAb3+167ZNVCnJm9XVaSb+VGEY23GGh5DpMrpOukHRy5y+SxuutxDNbBgJgnBTsjkGljXOvolJb7Z+DckFB5X/gK083at1r3GKX31lF9j1lTnoDMETjHfo6Osx+v+Uj6ntCM/NhQR4IwTxfPG1OnlD5i0qKJRgu4vp0+iNktqyRyB6kWg6kcFBoSs684hRyjiPYHtqUSAL8aRQf19CE+9nwuF5h6n/P9xYQkoz5MG6Di8y9lk2sAuZ2h8pY3zQty1WyqhCb595NUeQV37EEZFqzyBSbRiePcGhMtVhzkKbHWDuI8UTjWalACcCZXsabLrvj8X X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sen8Pl6CZdHt+fO92L31qw0rzt5HuWxEBW1Doo6II9MH74MGn58tiw0nZ/fd3isY920C2/CB6WiDXBCtxkiBg65XeRvVH4r7b087sRjIbcQFtmVa/rkTEs84Cps6QFXLqrenadT8TDWcKbNH5MoIZ9PLP1zje5ixHNb8WVMHcJTENu6C+xhleHep2aqYSiPpLI0v6GITfjEJ8rfk8Cgr/L7cimBPHEoDJYkj8fJM78oRacHLeI6cQSV4gRyloK9mokZe3tSqJ+U5wojYnQkmF2n2DpRxyHqSMyvcIAb5TfIRbCxnr50EweoFGhjTDn+48IyoGOGRDj8TeIZFI2/xlk2mjQctteuJjXef/C2xJpwTdnr4RB9/1piG/UbcWVBRiZvlpf68PPytla2FasGy5akw4y0Vb3j2EOqK1R6BrczThkrw/45zJn4zf4TZgX8R0qIcl0FlTlb/5a5eQrZcYl/G6AKlvWpMW5eZfMkqiwlt43GHpnyihjTxurxWfoGxzmqf0yh6kmfefRkhFA2I8Ck/DgKxXfSXZu8xHxYno6glB0gX5n0GYKA2YjUaaRqlRJisc3hTt65mVRbvsKhpOm5Y37Cbi/XKt+2Q/LjXCMjigtPRWREzxVMI/x0hK3k5iHWkqAFiqxmRKA2KLaMrzVlhdHRaBnDrDbW9MCVoDyReY0kzEjNv3Q0P1KCmc5PujP083GHfsW6FkWEoKqC+GPff+R/eqytQgvwi5kuEyQFuXEwX7qYynanIkZBVJy0XyE9qorsmF8fWTG/iSvA1GNyG00JcBjkAKihPYYaHIW7Hg0GhAv6fNjjocmzStkS3/mppAi7oOfzXk7bqrY5J2j6eJChdraK+q74wIOKoIu6IZNJnM+LG2cfy4sRlq4qvMhODETwmDsqjd5IOurpIjsLnj0dkSpc2avsnKJBqyZKam+QgQ0TVS8DzXGSaCbeKVu2E98BFgKPAHylK/Q2WoMg2N/cnad9t45Trc/7DYAm+bX/yl7wu8MYJFf78mXWkDQj1q4iiiP3FilpACI6Ns7Lj5m5DAdfeqVY45rzO8vTn+gc7APFRjbPP+5I4GK98TWj4ZeY++4tX4o/Vh0x26juQI26ucvFt0WyLr9+bUZFekXpHghW6vEKvNYg2D5ljXzP95t5teKtLhIdNU7OOAYEno/2MFL4r13aw6QapXq+Zn1vTVPIQ/08gr5C/HPIZWWQIKsl4BWIgsl9wcs6cv7Ma1u0fGJId8Pb3UnDBz6cYhCW0pkyp26756Gj4zSoDJ0E9n+n1+vv/y4g5keDYKQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a070c2c-2297-4db7-df0b-08dc5143d8e9 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2024 05:31:42.5817 (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: AS4P250MB0416 Subject: [FFmpeg-devel] [PATCH 10/10] all: Don't use av_uninit 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: hLxUY3o36NiA It is unnecessary, because we use -Wno-maybe-unitialized with GCC nowadays. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc.c | 4 ++-- libavcodec/ac3enc_template.c | 4 ++-- libavcodec/bfi.c | 2 +- libavcodec/dvdsubenc.c | 2 +- libavcodec/eamad.c | 2 +- libavcodec/ffv1enc_template.c | 2 +- libavcodec/flacdec.c | 2 +- libavcodec/lpc.c | 2 +- libavcodec/mpeg4videodec.c | 2 +- libavcodec/msmpeg4dec.c | 2 +- libavcodec/ppc/mpegaudiodsp_altivec.c | 2 +- libavcodec/qtrleenc.c | 2 +- libavcodec/ra144enc.c | 4 ++-- libavcodec/vp8.c | 2 +- libavcodec/wmavoice.c | 4 ++-- libavfilter/af_aecho.c | 2 +- libavfilter/af_compand.c | 2 +- libavfilter/vsrc_mandelbrot.c | 2 +- libavformat/electronicarts.c | 2 +- libavformat/flvdec.c | 4 ++-- libavformat/srtp.c | 4 ++-- libavformat/tests/seek.c | 2 +- libavformat/wavdec.c | 2 +- libpostproc/postprocess_altivec_template.c | 4 ++-- libswscale/yuv2rgb.c | 2 +- 25 files changed, 32 insertions(+), 32 deletions(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 7a6bcf7900..4d3049f012 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1482,7 +1482,7 @@ static void ac3_output_frame_header(AC3EncodeContext *s) */ static void output_audio_block(AC3EncodeContext *s, int blk) { - int ch, i, baie, bnd, got_cpl, av_uninit(ch0); + int ch, i, baie, bnd, got_cpl, ch0; AC3Block *block = &s->blocks[blk]; /* block switching */ @@ -2383,7 +2383,7 @@ static av_cold int validate_options(AC3EncodeContext *s) */ static av_cold void set_bandwidth(AC3EncodeContext *s) { - int blk, ch, av_uninit(cpl_start); + int blk, ch, cpl_start; if (s->cutoff) { /* calculate bandwidth based on user-specified cutoff frequency */ diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index 45dbc98804..ea0402fac4 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -117,7 +117,7 @@ static void apply_channel_coupling(AC3EncodeContext *s) #else int32_t (*fixed_cpl_coords)[AC3_MAX_CHANNELS][16] = cpl_coords; #endif - int av_uninit(blk), ch, bnd, i, j; + int blk, ch, bnd, i, j; CoefSumType energy[AC3_MAX_BLOCKS][AC3_MAX_CHANNELS][16] = {{{0}}}; int cpl_start, num_cpl_coefs; @@ -231,7 +231,7 @@ static void apply_channel_coupling(AC3EncodeContext *s) for (bnd = 0; bnd < s->num_cpl_bands; bnd++) { blk = 0; while (blk < s->num_blocks) { - int av_uninit(blk1); + int blk1; AC3Block *block = &s->blocks[blk]; if (!block->cpl_in_use) { diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index 58158f6eee..ef5dd0ce85 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -103,7 +103,7 @@ FF_ENABLE_DEPRECATION_WARNINGS while (dst != frame_end) { static const uint8_t lentab[4] = { 0, 2, 0, 1 }; - unsigned int byte = bytestream2_get_byte(&g), av_uninit(offset); + unsigned int byte = bytestream2_get_byte(&g), offset; unsigned int code = byte >> 6; unsigned int length = byte & ~0xC0; diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index c6110c29ff..c312da8afc 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -123,7 +123,7 @@ static void count_colors(AVCodecContext *avctx, unsigned hits[33], unsigned count[256] = { 0 }; uint32_t *palette = (uint32_t *)r->data[1]; uint32_t color; - int x, y, i, j, match, d, best_d, av_uninit(best_j); + int x, y, i, j, match, d, best_d, best_j; uint8_t *p = r->data[0]; for (y = 0; y < r->h; y++) { diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 1c3f97653c..12a0f50124 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -205,7 +205,7 @@ static int decode_motion(GetBitContext *gb) static int decode_mb(MadContext *s, AVFrame *frame, int inter) { int mv_map = 0; - int av_uninit(mv_x), av_uninit(mv_y); + int mv_x, mv_y; int j; if (inter) { diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c index 8953dbe07c..e8350d4862 100644 --- a/libavcodec/ffv1enc_template.c +++ b/libavcodec/ffv1enc_template.c @@ -148,7 +148,7 @@ static int RENAME(encode_rgb_frame)(FFV1Context *s, const uint8_t *src[4], sample[p][i]= RENAME(s->sample_buffer) + p*ring_size*(w+6) + ((h+i-y)%ring_size)*(w+6) + 3; for (x = 0; x < w; x++) { - int b, g, r, av_uninit(a); + int b, g, r, a; if (lbd) { unsigned v = *((const uint32_t*)(src[0] + x*4 + stride[0]*y)); b = v & 0xFF; diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 91bbdc657d..9d2f390647 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -303,7 +303,7 @@ static int decode_subframe_fixed(FLACContext *s, int32_t *decoded, int pred_order, int bps) { const int blocksize = s->blocksize; - unsigned av_uninit(a), av_uninit(b), av_uninit(c), av_uninit(d); + unsigned a, b, c, d; int i; int ret; diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 8305cc0596..f07cb0e039 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -279,7 +279,7 @@ int ff_lpc_calc_coefs(LPCContext *s, if (lpc_type == FF_LPC_TYPE_CHOLESKY) { LLSModel *m = s->lls_models; LOCAL_ALIGNED(32, double, var, [FFALIGN(MAX_LPC_ORDER+1,4)]); - double av_uninit(weight); + double weight; memset(var, 0, FFALIGN(MAX_LPC_ORDER+1,4)*sizeof(*var)); for(j=0; jm; int level, i, last, run, qmul, qadd; - int av_uninit(dc_pred_dir); + int dc_pred_dir; RLTable *rl; RL_VLC_ELEM *rl_vlc; const uint8_t *scan_table; diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index bf1e4877bd..7370251e09 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -626,7 +626,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, int n, int coded, const uint8_t *scan_table) { int level, i, last, run, run_diff; - int av_uninit(dc_pred_dir); + int dc_pred_dir; RLTable *rl; RL_VLC_ELEM *rl_vlc; int qmul, qadd; diff --git a/libavcodec/ppc/mpegaudiodsp_altivec.c b/libavcodec/ppc/mpegaudiodsp_altivec.c index b065203c4e..bb962fba23 100644 --- a/libavcodec/ppc/mpegaudiodsp_altivec.c +++ b/libavcodec/ppc/mpegaudiodsp_altivec.c @@ -55,7 +55,7 @@ static void apply_window(const float *buf, const float *win1, const vector float *bufa = (const vector float *) buf; vector float *sum1a = (vector float *) sum1; vector float *sum2a = (vector float *) sum2; - vector float av_uninit(v0), av_uninit(v4); + vector float v0, v4; vector float v1, v2, v3; len = len >> 2; diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index 71d57d7eb8..c1273af30b 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -145,7 +145,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui unsigned int skipcount; /* This will be the number of consecutive equal pixels in the current * frame, starting from the ith one also */ - unsigned int av_uninit(repeatcount); + unsigned int repeatcount; /* The cost of the three different possibilities */ int total_skip_cost; diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 92c35ac12c..1b22113dd3 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -192,8 +192,8 @@ static void create_adapt_vect(float *vect, const int16_t *cb, int lag) static int adaptive_cb_search(const int16_t *adapt_cb, float *work, const float *coefs, float *data) { - int i, av_uninit(best_vect); - float score, gain, best_score, av_uninit(best_gain); + int i, best_vect; + float score, gain, best_score, best_gain; float exc[BLOCKSIZE]; gain = best_score = 0; diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 539b5c5395..0b76a60d16 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2656,7 +2656,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, VP8Context *s = avctx->priv_data; int ret, i, referenced, num_jobs; enum AVDiscard skip_thresh; - VP8Frame *av_uninit(curframe), *prev_frame; + VP8Frame *curframe, *prev_frame; if (is_vp7) ret = vp7_decode_frame_header(s, avpkt->data, avpkt->size); diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 258c71330c..f693afd8de 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1500,8 +1500,8 @@ static int synth_frame(AVCodecContext *ctx, GetBitContext *gb, int frame_idx, float *excitation, float *synth) { WMAVoiceContext *s = ctx->priv_data; - int n, n_blocks_x2, log_n_blocks_x2, av_uninit(cur_pitch_val); - int pitch[MAX_BLOCKS], av_uninit(last_block_pitch); + int n, n_blocks_x2, log_n_blocks_x2, cur_pitch_val; + int pitch[MAX_BLOCKS], last_block_pitch; /* Parse frame type ("frame header"), see frame_descs */ int bd_idx = s->vbm_tree[get_vlc2(gb, frame_type_vlc, 6, 3)], block_nsamples; diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c index 68fa5aaf7b..7df149df94 100644 --- a/libavfilter/af_aecho.c +++ b/libavfilter/af_aecho.c @@ -165,7 +165,7 @@ static void echo_samples_## name ##p(AudioEchoContext *ctx, \ const double in_gain = ctx->in_gain; \ const int nb_echoes = ctx->nb_echoes; \ const int max_samples = ctx->max_samples; \ - int i, j, chan, av_uninit(index); \ + int i, j, chan, index; \ \ av_assert1(channels > 0); /* would corrupt delay_index */ \ \ diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 880ee6241a..ad09db34df 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -195,7 +195,7 @@ static int compand_delay(AVFilterContext *ctx, AVFrame *frame) AVFilterLink *inlink = ctx->inputs[0]; const int channels = inlink->ch_layout.nb_channels; const int nb_samples = frame->nb_samples; - int chan, i, av_uninit(dindex), oindex, av_uninit(count); + int chan, i, dindex, oindex, count; AVFrame *out_frame = NULL; int err; diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c index 982ef71814..cc42e22ddf 100644 --- a/libavfilter/vsrc_mandelbrot.c +++ b/libavfilter/vsrc_mandelbrot.c @@ -255,7 +255,7 @@ static void draw_mandelbrot(AVFilterContext *ctx, uint32_t *color, int linesize, } for(x=0; xw; x++){ - float av_uninit(epsilon); + float epsilon; const double cr=s->start_x+scale*(x-s->w/2); double zr=cr; double zi=ci; diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index f7f6fd4cab..e5cb8abbfa 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -588,7 +588,7 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt) int hit_end = 0; unsigned int chunk_type, chunk_size; int ret = 0, packet_read = 0, key = 0, vp6a; - int av_uninit(num_samples); + int num_samples; while ((!packet_read && !hit_end) || partial_packet) { chunk_type = avio_rl32(pb); diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 22a9b9e4a7..08d244b39d 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1197,8 +1197,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) int stream_type=-1; int64_t next, pos, meta_pos; int64_t dts, pts = AV_NOPTS_VALUE; - int av_uninit(channels); - int av_uninit(sample_rate); + int channels; + int sample_rate; AVStream *st = NULL; int last = -1; int orig_size; diff --git a/libavformat/srtp.c b/libavformat/srtp.c index 7e5a42e327..174cac7a82 100644 --- a/libavformat/srtp.c +++ b/libavformat/srtp.c @@ -128,8 +128,8 @@ int ff_srtp_decrypt(struct SRTPContext *s, uint8_t *buf, int *lenptr) { uint8_t iv[16] = { 0 }, hmac[20]; int len = *lenptr; - int av_uninit(seq_largest); - uint32_t ssrc, av_uninit(roc); + int seq_largest; + uint32_t ssrc, roc; uint64_t index; int rtcp, hmac_size; diff --git a/libavformat/tests/seek.c b/libavformat/tests/seek.c index 94a72d9422..cb8dcbb9fb 100644 --- a/libavformat/tests/seek.c +++ b/libavformat/tests/seek.c @@ -118,7 +118,7 @@ int main(int argc, char **argv) } for(i=0; ; i++){ AVPacket pkt = { 0 }; - AVStream *av_uninit(st); + AVStream *st; char ts_buf[60]; if(ret>=0){ diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 00856a5eca..5f01c89745 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -350,7 +350,7 @@ static const AVMetadataConv wav_metadata_conv[] = { /* wav input */ static int wav_read_header(AVFormatContext *s) { - int64_t size, av_uninit(data_size); + int64_t size, data_size; int64_t sample_count = 0; int rf64 = 0, bw64 = 0; uint32_t tag; diff --git a/libpostproc/postprocess_altivec_template.c b/libpostproc/postprocess_altivec_template.c index a9d4cd29a3..54e1546bf9 100644 --- a/libpostproc/postprocess_altivec_template.c +++ b/libpostproc/postprocess_altivec_template.c @@ -227,8 +227,8 @@ static inline void doVertLowPass_altivec(uint8_t *src, int stride, PPContext *c) DECLARE_ALIGNED(16, short, qp)[8] = {c->QP}; vector signed short vqp = vec_ld(0, qp); vector signed short vb0, vb1, vb2, vb3, vb4, vb5, vb6, vb7, vb8, vb9; - vector unsigned char vbA0, av_uninit(vbA1), av_uninit(vbA2), av_uninit(vbA3), av_uninit(vbA4), av_uninit(vbA5), av_uninit(vbA6), av_uninit(vbA7), av_uninit(vbA8), vbA9; - vector unsigned char vbB0, av_uninit(vbB1), av_uninit(vbB2), av_uninit(vbB3), av_uninit(vbB4), av_uninit(vbB5), av_uninit(vbB6), av_uninit(vbB7), av_uninit(vbB8), vbB9; + vector unsigned char vbA0, vbA1, vbA2, vbA3, vbA4, vbA5, vbA6, vbA7, vbA8, vbA9; + vector unsigned char vbB0, vbB1, vbB2, vbB3, vbB4, vbB5, vbB6, vbB7, vbB8, vbB9; vector unsigned char vbT0, vbT1, vbT2, vbT3, vbT4, vbT5, vbT6, vbT7, vbT8, vbT9; vector unsigned char perml0, perml1, perml2, perml3, perml4, perml5, perml6, perml7, perml8, perml9; diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 2b2358d2cc..3689f95856 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -803,7 +803,7 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], uint8_t *y_table; uint16_t *y_table16; uint32_t *y_table32; - int i, base, rbase, gbase, bbase, av_uninit(abase), needAlpha; + int i, base, rbase, gbase, bbase, abase, needAlpha; const int yoffs = (fullRange ? 384 : 326) + YUVRGB_TABLE_LUMA_HEADROOM; const int table_plane_size = 1024 + 2*YUVRGB_TABLE_LUMA_HEADROOM;