From patchwork Fri Dec 3 20:45:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31944 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1173496iog; Fri, 3 Dec 2021 12:46:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7Xw8TA+NnETg/4jbC2c9w5TCplooDGdoVGStiYgX/R+Smv9aBwwsOefstMHFZoVg/Oohy X-Received: by 2002:a05:6402:3595:: with SMTP id y21mr29655893edc.332.1638564383447; Fri, 03 Dec 2021 12:46:23 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h27si5590058edj.431.2021.12.03.12.46.23; Fri, 03 Dec 2021 12:46:23 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=otzSUxvY; 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 0C72568AE7A; Fri, 3 Dec 2021 22:46:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075052.outbound.protection.outlook.com [40.92.75.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E19068ADF7 for ; Fri, 3 Dec 2021 22:46:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aH2dt0bxKFKUv5GAZWCr1S1VcATxtnkArjBvDV8IvVyfa5dUPPG3XOHJZNB1R9gWXqucjd4xIpwtnr0AnoKfjcjkmppij7J0WDcgx8AL9yhzzxhGCzLcwuetgbLMydTeH0OI917qwmWzrFGCSB51bz5lRn7rjr70cHbj6ITJw24ShvDCfqSXITLbJ3sWTmBvTIkKiaGLd3XoZfo5+wAIewPhy+zrWeg9G7OLYLA9sfFS5qEjvodwrLuKC76MOX3ugNHP+Q5xnfWh+/v+pzcDDXCJZ7mFtlgkhr4F/TRfC215t/LE3oPWNsxokdyQYy1+VKQadGo5mCAodsjUwPp6+g== 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=daWdRFqaJRhWQcyqQWETNnXhZTwulAZ7uRkENI8udCQ=; b=WFoo/6b2CrV0BFtEoUMPB75XaCAWmjGY8ab+bLB1z+WzeGHhur7qqVqeHt2HWAPxNg5ZQX+jvBrQ8cveSZWLp4+lGW9HdmgbEPz9xoBezqb/H7YQBlCiuJo3IYG5RLeQrtjvbeIwQut40GwdzOZJKAzgcUKv4nZ/7nNqkCHx5fd51wisodRlKTjiOzRZhsVZSdsYJgF23AvyyawX7ufm7sCvnPxWXCXog4kro4P+C5xXALT74qocuIyQVt125O/8KZ32PTvMw9o3J6COu4SA9vfe8fZxx5Y/ikBLIM40EnXaA0F95h7WKD8fhwlubRoZW4RBa5GWh0a3wvgsgnKz/Q== 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=daWdRFqaJRhWQcyqQWETNnXhZTwulAZ7uRkENI8udCQ=; b=otzSUxvYl370wznY8m03OwcIct/GzAoEiqmKHWww+r8WOMil0cMCYSsc6ZQ+7U9dJdziZmjtqMpvWH3OfDlh9v7WyctT4N/nJztS1ZZ1aGE7HkZRoBqiBx/kd42V/ED2k7MFuIV7yzPkxa2zH6d64kai/jpLccKARwnaBJr8+6u1QY8K6Qp976L6dbD66oCF31D+0nT+aZ/249BJfhvEEgxAmecGnI+MXj34wtIJLIqmO+owjLK9fw+Kvv72NOvzmh+uq78BGHxeOHPij9J5tbuKqjOxq/LftgSd9CHXrLDaSNy2nLxLxEcUsQRT87gmr9NphVmyFG6kwsoa73E4eA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3831.eurprd03.prod.outlook.com (2603:10a6:20b:17::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Fri, 3 Dec 2021 20:46:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.019; Fri, 3 Dec 2021 20:46:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Dec 2021 21:45:47 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [sUZWJqr4ILCZ2BhX5K7xQtgf4z8nPGFH] X-ClientProxiedBy: AM5PR0301CA0023.eurprd03.prod.outlook.com (2603:10a6:206:14::36) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211203204548.2005738-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM5PR0301CA0023.eurprd03.prod.outlook.com (2603:10a6:206:14::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Fri, 3 Dec 2021 20:46:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32e6da5e-3beb-41af-e684-08d9b69ded36 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQtx8w+3h2yNIIsmVb5543qYKUP2TQabiEUXjPBP5qaZ3lHchZkIADd2zFw8+4bZkRNjkWW6pUB8mw/YTWQD2/yGVBmbD0mr8OlEvDWQxf/kEF53tG4Dq2Ov42q0aF01efD7rmIHl2RVlJLWhhQP0DhocD6LttuGyTn0+b6nR18Qfs+Q20TOvBXN2zRrBwxLW+jR6Jim83dPBRcDh3qEgKZqXaTKJKhMw7P6q+QKroPTQxUjCGdm1w5WRp79aeqLibjeHASqGSSzDFXwbNaezRPVI8k3aTzPt7PBrsR8XXx16c25I61EmmCszEXoeHonywqGmRYI+bAwwbFnUHhKhaP+9ONN0BfXjE7l09WZu6qFJ/+bdSDmt+C8I3bSMQWlDfqXTuvcxF//fJVg9VYT6EgfpAPR6VBpabAJI6Q7g85Bm6VeVPlSzJsi0pF1B7OVAfEZqaHJqu0BuCcgfgN4QdiSdLqGGMMxOtQVbqiJMqW7E8P2ttnQXgfuBmaXHb7Z6Rh9qHtqQMwQVoIOnmHP1USGNPpzi68hWAYW6O+a1iH9BNAzElTLzSjIDzP4Q7wq3Q/V9uBWpM2JVnuvQ3pXC6n8AqRtWlFE9Ji60ABK9f8NfZ0GVumnLce87/VlFQoM2UMzIZGCzavzWI09yaeoNy+FtHHsYmFIRgKNb9TJy1jWJIziePZE+Dv/Abzx162Ph9HCV7A/KceTsHrizutbX75BuPSLthhVK868kOL6ObOcrNZYcQiHEZT9gvFqglWHC0= X-MS-TrafficTypeDiagnostic: AM6PR03MB3831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J+NOEMewlhDxYlVfgitnA/uD+DoitQ0TajbMU5BQ6xlta1m8mAY1OzPVZXJFEEHhv1uGhZTykD3zGPSwA5zrI0VgWfbkloAxeBv9STrJP5ovQS15+x0qnlEr3S+oxWKy9otbnxZQzrmP9OPUIbjsqFXrULXDCmXaWhwaiDWDIBwjvrxF8cx44KrzQYTlIVFpEg3xp9+pLvbg0zFoA2BJ2V5zjSaVKcn1AJ+0e6MryzfkI+eZSiWjO6Kge6rfJAf8zFYFzWWt05xw7YC9b/X1T/s31OmSoXZdi9uH6kkimUGOOEVi8lXcXcZI21ShyL5Q+loU5R6f7Y8/qxGC9udtVs/+olo3588dSYtkhGzbTpNPi64SOqo0M8hPtIyjINe1sostT0EkP/f5ptKVir69BUBg3iNARzn94nMcfMoEcM/2lHbyA2IzJnkUIGgbWAQDov2LsTHjn6IoOjOVoFlhYIUf/ffZzsdNGfy35Vb4/X/Pl54WBcQ5oAwPxqkVTl2rPwXCDrwEjD8poPXVm6fXmEG+ymuJkLZSPqUEdImDc7wolD9EUYNN1P3//4mPurdpFzgRSjdX9UhJ/kBxs3PcqA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eeZLJ+5CE+DVyz8wrk5viAqjJ9t5d2N6wXE5fGSRxxsQyW5gtXv0xbUu+qnGZLZAi7Qh3dAJyt2hWJmg+U/5OKTreBHFzfS/gNWjiPMzdGcIU4yxlDW0C7nVCW0UmJqwXXlhzb+MU5E4uPXpWpTOXedLa17ovrHB/Fzv9v21MpxVgWrzN8yvwUNpEXvAc85vLSsf5q61mH52jOkGtk6krHbZbLhAQYS3QSSbCO46z6yk9lBNSsdxnAF27Epsf+kErK33qfUxp1ii2Jk8rMJl5Yr9z5n09/9PrdpR/XmmjR4p3uI61hQj23bTQa+N/ku2b4nxxfr3lpMfqpnZmqqasVu975xhDcYAYzOkBJ41JxbkaYYu0QPm+FHnv1FkT2+1qu7bTp0RqWml3XoUibUnXIA2AIZuSnylF++P4ynvtz/dMnU5KQVuKW1AQlBI3vfJEQlG0Lijq4oFU147a07xZ9XqOKcSqetEM8UV0X65ygOABj28I73aRJABMolMfEGXeh8Vmi1JdMkxb8BV+jCBsXuFgXk/XTeIuUs7hwbDaUNwupYGmEQlbUyYoUb3rqcvWygjXRdP+NdyQMpuQ5g7o7UkDPaE5tO20Lr6XzUc56CWwOqia9p0bIP85ZfeOA/osDGUPIWbp3SzT54PIJhO9QURAgpP3AC97Cewd9VBCs6SQ4c8wq1MLFyxnUPX8uYaB0bEdWgc7mKI6xsNjfdOQDHHG1R+F3YMawURwtqCpNWEorl5m6jOoEHqIs/nYL/+ghYpTynTmKjsHegQOG6Pxd9RywJ4GeXB0IpqFlEQCoMvptVKgINvh6jhn2HUPzKAs7HL7OGg8b8jqC3e3CU5ZS6Mj/040Ta0qskXb1Uz9jZLnyoH/BHoAZeDKiWDpeUJWIkHKIFoHtKPuBf//iHQcfDX/IuG6bzyxFZOwdT2pwLI0fZIkr5W+RMIIy8YgtnSQa7jPwWGPPSdVl9yklVN5w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32e6da5e-3beb-41af-e684-08d9b69ded36 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2021 20:46:05.7428 (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: AM6PR03MB3831 Subject: [FFmpeg-devel] [PATCH 6/7] fftools/ffmpeg: Avoid creating unnecessary reference 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: TP9c91iHMrDp The only caller of do_video_out() doesn't need the frame afterwards, ergo one can replace an av_frame_ref() by av_frame_move_ref(). Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 8c3a4f7c0c..638a6441c4 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1138,6 +1138,7 @@ static void do_subtitle_out(OutputFile *of, } } +/* May modify/reset next_picture */ static void do_video_out(OutputFile *of, OutputStream *ost, AVFrame *next_picture) @@ -1421,8 +1422,7 @@ static void do_video_out(OutputFile *of, av_frame_unref(ost->last_frame); if (next_picture) - if (av_frame_ref(ost->last_frame, next_picture) < 0) - goto error; + av_frame_move_ref(ost->last_frame, next_picture); return; error: