From patchwork Thu Sep 7 10:38:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43634 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp506337pzh; Thu, 7 Sep 2023 03:38:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFUQDaraVef7V5NJ98u9e5nod7wVRzuWvEsfCTr58xP1mD08cOFYBfDSFJwgVUCtzM6DbJA X-Received: by 2002:a17:906:5a66:b0:9a1:d0bb:d215 with SMTP id my38-20020a1709065a6600b009a1d0bbd215mr4445843ejc.5.1694083099797; Thu, 07 Sep 2023 03:38:19 -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 gz5-20020a170906f2c500b00991f1a1c99csi10394735ejb.360.2023.09.07.03.38.17; Thu, 07 Sep 2023 03:38:19 -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=HEBHUQbh; 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 8DDB968C868; Thu, 7 Sep 2023 13:37:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2063.outbound.protection.outlook.com [40.92.58.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44B3068C868 for ; Thu, 7 Sep 2023 13:37:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hd0EDuq+1gStugNHmsOvarEhjw6yxnISi7YLnS84DnEdLUoyk9JcaTkAHU3dlnT9qAWRc8K8z/ErjK+uEccFEXGW4T5DANv7G3v6H5Q45gqq99el7TDjnIfo9nLZuUu79sg0KRhxlmV+/fbcUqPJpeEmvZ21lXbOddydraPNKJBo03BHPEzOkcIQ5oped6xVNdw2hjZ3iypRpOHG2CM1sSeUl1AAwu45EkwzxTtpkawXOOYyg/Pjq6xM3/431/pMwa5NiyP+ksvMgSCqdBlYFj/SpCHg4oVMrGWuf7jQ4EJihq/RprRM1zD1z9m/loFYG/qra/VKim504tGxY6/kbQ== 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=tBOWf2jXvvLxb0T++5j1klVF1qOAZJnj58tZ3iuLz0s=; b=IrJWX+fuobsRtg2/bgkDIGWqA+THAgVQrYYw15yk1kenz6w2zGE3vG9ppraLJdwmlfwaO9L7wzkV1Iat2WVLRsACILfhj56/X7zUjeFzuTVo9/a6FP4imp0iZTcwJ5yVPuQ3iYerpVBw1o1fz66l27TYR26o4cT+Tt0JTTiIp8h+gufa73qWls85lUrGegE9CjQH0r3yy1GPW0MSa2x8mZzG6jADhPbAaQsI43xTCL66IGYaVGgAXHPiBrJOy/TL4L+pRhGgAMFkPcgZ0cnshWzEkNF7/WnHM4HKvgGVzG2CVROSb2gqb//mmv6SbUFtH3Y9OTh8578tMLxlCKZZ+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tBOWf2jXvvLxb0T++5j1klVF1qOAZJnj58tZ3iuLz0s=; b=HEBHUQbh0mR6GXC/1/eoDjIf8XNziDPQPgScPb9k+SiIEzD6WJ6+PYdT6mVkk2thfP6l1QHK40vfGhdNtexqdJSpeWPVrlr3AB95nPO4mtyKUZddiXu0Zi93r0CMy2v/icu+9hnu3yhEXqxaSZtX1trakLODLbPmYnq5dQCdy26uALy6dfWHVWOtIHMucBw861QHcEsxNVNaXOM6G0Xwf2VAiY69YX3EaK9Zmk1XYWqBkpfI/3dbKdbU7qWxJm0KC77pJW6ph0bxAGiAgaKdkIVvgU7GcwgjPJQ3SXqpnrZ5OgYmjv4YeUgxHnGBX460vtL7on0WfQkKrSK2YTGjfA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0191.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 10:37:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 10:37:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 12:38:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [h1oGjuq7kvJJ9X92ah5pCJw8pwV3p0LD] X-ClientProxiedBy: VI1PR06CA0127.eurprd06.prod.outlook.com (2603:10a6:803:a0::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907103844.673303-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0191:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bfbfc4e-e4ab-4c05-9b51-08dbaf8e74ef X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3rdZpyEp3ZP+I+HfWsfMnHlk3NNk4p/kmDV4HghnhcCOPYU6rS7QPy+t+jQgvBHwUffziHNqyxRmU3yet+MD/5ejQQW6Ma16qDLr0svtnOOAwjV6PloCisbeAmm3+iPBN4F15FqqPphvSferjjnaoS6blSgwScijz6cMAmX/Uj1Q1UI/4frqh++hi6xmqDJYwkUgB7RUXXm6yHuLnwPueCjSnkQOHJLqYSOLb2uSeHNySvDKT3kLn+ZB5r3pIzFfxzcX6Rl4UyTixNTK75D7G8Y2B8jgq+zhwQ8UoZ4W9/Mw+AfVzqy8G7K7LqkHNSARHQoaG59Wlx+Z/fuTuooNZ1qnMwvbNgGR/eMXHauHEM5U97e2H5c8ZD8MZiNGkd6k6Dvuq6QTxBx2KVIuxGFjC136KUf1SLLWUUsQNtaA78j24xkr7bOyTy0kkPIr7iZOU9h3h+dd3b7VnmHaXXDKahbCzObpsSVuX5vnu0wU3JbaemVknnnwaQtt/GAZoPX+io2B9eoPdYORa6baKwRAgGCZOB6+12ly/+4aqfp9XZ/KVBmpCzOpzFFdMomsGI7rmWoEMh+XcoAT2waPp0gLshakHj/G2lD1gNa+c6iBPpA9mOuQrVJ5dkXvjZKFNJzi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h4wOjnSDd2yVS5uVAsAT2+4NibXpn0TjXkTIWYJpS+2kZtcXUWIk+nyXMmlyt5O76r7GK4OP/zMnJkJ5Y91lBUpl15Mk2TsfD0KsH6CmRuaR9c5K88i9t53olPZNIhxyOZT6SJec3HrkjEBH1sGJOWwuo6Kwl0TrPOHd/sy7ClsAscbqE4D5Bb/wm4Dk07DDzLsg3Pz0rkvf6nIp4G8GOZuTccnZXijc2/9jzqn5mLVURGuToiobnAxsdukSVVe8P/TOtP0r0Vx/ZRoBPJAofWaAThlHhOHXP0+NCcOv5T7iXEB4fiTzgUMF0JoMZBq7kE5JdF288Kn5TrWlgrTRL+EF1OpbQFZ25Vg+hDEEV4S93VuS6KPOmxYdR86S9nrNmAbx+HwjuFgOdqj0uQWG9GNCf6qcJnRyzP5cFAl5Qf3NhjEAtNVntWasqOiEgV6RafkV7j4BZXZS9nRG2pWcCk6t9HgtTGAScA493vxF+c3zk9/XHlupYoFIiKrn3r5EbIA6lcOkOYQTD2/AQxUkcaMZv7Lz2wlT4twI+SJXfdQRIBUr/KAkUzMujd1S8InUlO73Npkj71XOMp6akG4//E4t5BF5JZ6P9PfGUFX18hvRuZeKLEjl6hTT0aj9GZ0CrLtB6YV4DqF4ZMGFN84ws9kJIQb2tyZmDjCvWxG6P6Gx/WF9k4VcyJKGaOrziJDwJAS096J8DIWkSiEK0kuywpKCc6pMwuq6PI0RRoJewKcbh9Pa4ZouakwQLIkt3Q52HVSDikWN5PjTULY5zxDZO9mXpRW5HZK2VHxEcne/BBGmyVW4r8O4rPGtq0W5kPiKE7nkeXed3zNz3UdJPSnq4ZUyHdNteGoDFGL7HrpUrFJX6/FEjslylgiN6QY4jfG+5fZRtZ1XVhpe39oZE8nIrPptTfRzefqiVRFO3szCGGVbyVZd4Glt54RANz6UcsRR1Ey3VEqXrqgKLDyz96hpmZ9Fr/GyDRk4tWRYhyTA87xyQtrKDWReEBqfvWYXBvpUTPR/swg4upxdJIgqZNq/JlFpRm9Npw/IjgUEPisqGeI1c6OguboRZO8J7Sv/A51PZH9sFdFu4HFqSEgrzyf2r90rl8ItnrZOmlBAEGxQPTicTsUYvhm95sATptscfPbNGH0S5LlCUpITDBxElWqFhP80hfrKaiNPxZMX0+09wudiFpDGC1/pTbXAdJKrpgEs+qAZZOK7cc8UaTH8oeQOOs5E0Anuxh9qGQtFw5+dk5a81naEF6atc8xfVm44zLII X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bfbfc4e-e4ab-4c05-9b51-08dbaf8e74ef X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 10:37:38.7620 (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: DU2P250MB0191 Subject: [FFmpeg-devel] [PATCH 26/26] avfilter/buffersrc: Use av_frame_clone() where appropriate 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: K8wZv4gigaFF Signed-off-by: Andreas Rheinhardt --- libavfilter/buffersrc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index ea50713701..453fc0fd5c 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -230,17 +230,14 @@ FF_ENABLE_DEPRECATION_WARNINGS } - if (!(copy = av_frame_alloc())) - return AVERROR(ENOMEM); - if (refcounted && !(flags & AV_BUFFERSRC_FLAG_KEEP_REF)) { + if (!(copy = av_frame_alloc())) + return AVERROR(ENOMEM); av_frame_move_ref(copy, frame); } else { - ret = av_frame_ref(copy, frame); - if (ret < 0) { - av_frame_free(©); - return ret; - } + copy = av_frame_clone(frame); + if (!copy) + return AVERROR(ENOMEM); } #if FF_API_PKT_DURATION