From patchwork Mon Mar 13 04:15:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40658 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1422410pzb; Sun, 12 Mar 2023 21:14:48 -0700 (PDT) X-Google-Smtp-Source: AK7set/DZDYBaLbLPS45uaTDepaYlejiBJxI0Yh6dPvlx9Z48WVTEbzV3bYpvZHp7KfOxkzWCD6e X-Received: by 2002:a17:906:d9c8:b0:8e1:cc38:6ab0 with SMTP id qk8-20020a170906d9c800b008e1cc386ab0mr29570313ejb.16.1678680888337; Sun, 12 Mar 2023 21:14: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 uz9-20020a170907118900b0092b845e3fa5si353756ejb.765.2023.03.12.21.14.48; Sun, 12 Mar 2023 21:14: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=p8fI0EFn; 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 C352768BBE3; Mon, 13 Mar 2023 06:14:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2012.outbound.protection.outlook.com [40.92.89.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2FDA68BB98 for ; Mon, 13 Mar 2023 06:14:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fh/wnMQi/ZJC3y2l1wctnUlfcLvUAryqDVUmfLpqONYM/p2ytikJep4BYp7wIjBFrwg85q5F986o0VSf5P+oPvPAsNMWo5VvP8IfX7bchY713hecfN/Z1cEcmCR7Ay2NUI2PhMjRDkLsLaKvhdT4+K+rVK0uEIFdu84ovqUQyRImUA4YZewlyBwJHKKLhm+3zw+0QYU76pORPaO3hK5B0W9m2PqIITBbspVd2I+6TlF0bocpwzPllt+BqPk7iGE6Ju36iDR41OiPjNbtxXQs3crfWNuubYk5iW/A4O+e4nIehW/Glt6SGmlsOZO++czfY2qGhB7kwjOlZu/4CvA0vQ== 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=DW/VttdL4EX+6RTz4eXNOqduxij6qq88pusqB1ICLZc=; b=Fm5juZmySob2PVl28QP+VkWNm7+9DzGZhbHXV0PAvUQtCQLH8Rn/FC8zbrsYu5RO+nljVSPtBCddfSUqps5hWpBk6/54oJyxnykPpWU8OABV5tz8LJA7XEZ6FBuIZxT1AonNiPsrwZKGiK4jDXuPNeIGfHeWi0URnV1+JfCkb+ZLAYNOcqXwELkkLy2kNGkpjvSek6UJH4Qi4e0q47insHGuTToLpKEFvaxpU9Ch41t6M5RPfmr3lmGWSqCefEtjHBun8hnfusBaFWzzPHtKqP1x1yWsWmtW5RoR4IbRhG+KDsZ/B1msr0Dqtb8NDqFv0UoI0o5Ca0C+H+KFpKvPVw== 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=DW/VttdL4EX+6RTz4eXNOqduxij6qq88pusqB1ICLZc=; b=p8fI0EFnqCR/Uil20SBFvRe1k6LW+awPe21c0cgGljLKf323onBbGj2U6oRaMqSCNxc6Y2NZTr5+PxzJsZ3VQgt0h4JBw9kU5Dzypmi4XvajGdMlxyzj+sqXom5/AQfqi2JglcBkS6zyMKEHUwY/IPc1uYY30PpHNOSxVSGhf4xXs1zkUNmd4Fw5r4ipF0D6X5ektmNCo6Smoo4BT2uyUZNPp0n41NeBakcXEp0a6ThG8qUZYKtu1ip4F/+9+V1zsDSL++dggtX/WaoeUy+sSNvaVd/6UeM4p6mnEc0beZ56ZCQmY7Kh0Yi27Vlg/UAfaEvGdaAcnyaoVuWL9ujhvg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0948.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:41b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 04:14:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Mon, 13 Mar 2023 04:14:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2023 05:15:00 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [G6gLKmbOqxeksc2lbZSmSunce6PPz1dFfnTB321RNXo=] X-ClientProxiedBy: FRYP281CA0009.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230313041500.475554-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0948:EE_ X-MS-Office365-Filtering-Correlation-Id: ff7c3a53-3870-49c7-53ac-08db23797229 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9U5yapy63PF6NSNcXu3YiMfOAnasi/vfjX/+7IULLmTgp6Uqge5kBSKU+x9BylczCm6f0zvgJGDXy1tnndj4EjUBlM+GEea8phYxbxYELVigblcpu40SSV/VpTi5fCenQdPb3c+GsDo1LOIqul3rHQcyDfDY403FoSFFpAI9TEs23RXgUYjCJ+8cm2yBbDRknVXzlckY93C4xnfJ3gCgZ31ICNgFWF4hBN8l2tMpRqRfYHASEWrsUzb5T4wtL3s208GHGcCUBYoh54uVDFboiNVqxlXRTCMpwS6XDQpj+oXhUzvrRr9MqBwA+CDkvfrYTeQM+clIlZSzYsgDMeda+kRGMYjVlWxfKUa2uc/d+W3kU1VZkyyYDxD7mpFMgOs1I2a8MJV/vTJCqZ8OlnbeKd02sl8QlmrFIBNk5S8eihiBVpJ/KK1e9qusLlex7xJpafSbQxVsIDyjtpphSlDCIYtA74/tOjWQOs7HpHxtI50ZWb9tqlaZGAFu+XplxJodztbAfj5IP2homsPXmbWYNV+MMr9DFKvaTopTYimVGsEVGbR/iI8q2Xx8ckxgfgNYH5ZzBKvqG3wyKfgXTWz35ofnBarXFLgKCfUWGOxn9B9UeKbEYzwkMzxv2m5PE4Mwa9Wn0YAp+zjyGkYX0rMKAFvA82ZFEDpTexvl0TJcLt63/1nkngYQ7h3kWLEziu/G1gLXnKAi68Z2jvZLcdX9aiSnZkbWVoQ8J7/Pm2gwJXmN5qGOVfXQl5+4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /UrY+MF73Tr+rtnok443GWZK7AFXXCE52xGrvlsOr5QX++a2gYGUA9fwBn+SQodh42E0pnJI9PnTiTOAMr1EtIT67oIcgqkJ0NFmFugKc4mtqhGZRYzZSrMWY72Ma5udXSKx1eXcpg71KLRQC9Nsqno2C7wTAJ/MpPMGx+VqFESLYxgB6yxTaXB2cJs1SWBBukV7/IXXiIkuipLAnrTzQ9MFRNfAXvFDiJi0qvXBK3LejQtipnbSue1pCtS9OqmigRiwGvDUXOVLOSaVCHjV36Qtwr/BSGdCrz0NVe17f7E3kxkaVqHu9riGaM/cK3cKZXHkEIwchLpKW3L2MceNZcBfAFtxToD3W7iYBn9oZErqlDbY2e6blWAmomzjf9bMXpvqjVAA7FQH2mIvBo3bw+bkUziXrG/0yWcRQc6XwVTyYDiJFckOaB2DRzQPvBt1Xj5kSVYUGFKMHA0Kw7dQBgfGUMrR2ty9lauMKR+RhDHQhR6QHFSK+YivmwiXKpkiXsOKgPcfCcwSh50Ihcg6n7i4hppY1jOJp5o/KIjSBzoJMRAOVk5WzQpf207UxYV2ZUeA5gt8YHTHBVW/zMpDRWxJ5n+q49R1aeSOIIlcRxMMK1R6uV5r3JxcgQTCCQtkwPh2Ru9QmNzvtY4Q5jjqdw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6bNQ3mIkDG1yfRuF4bV2Y7Kyzg13/T6CVnoZRPXOIy2eSlsAR5KvDF/XjhTF2IIIP61EH15v3R4+1aePHEfJ+Kye1GEFujSkUMpENoDwFBBcngPgMalM2+LJN6GleqN9S9maR0Mz221O5SHmrVmgOZ9M7xBR0CBtbAvbTXUdxwkw4F7EFJyat+E49bMGP/Ijs1UsxYD+briPl0q04ljlEsRrVqUmkAIRsk6OGceSoi/Y8qXRS4fbQz8JSYuWtigrfEa/xjfgqGN07PI6+GrnABCS5XchdaNfLZi8qrR6S8I9qFovKFRD134HQjIyBO1xvUlirknF0fD8WwknHYQ39GFrYBDtKbcfj+ibgeZhms+ikh89BPakOit0hZTUoo3fd1eBk5ohVMf1dOp9gvcx6csx4rtJkPVSWgLwPJzbEjL/iQslwAnRZcbUdn/8ZzrmLtuoeczSxhk0wf5wwn7gBIYmP158rWN0OMelYxZ1mhKl0GCyP+4ROy1GMv/gYTq9ITye6L7XyohtwQ/VorQcNQRfGLSiSIwMKU7oVZ4GJjjgC0uKviHx0z0ClEzQ1ahX8beH5M/qzyS9SKCiApAPeKWGH0tBjt8AxrGWdh52fBx8Y9JeVQwombzaJ7sDCL76rOj2ghM7ab0tYuD7QTqCyeZETakW6fn9WOiKLTR3eCWpHt1wZIp//4hg+E3bJ8eWeI8/Lk3hMhL9KZdx9nv6XOhAAtS6dxzP6L72JvFWgfowmmWqMu9aQIe5nBFP20dCEoLc/bqUQ+hLiW0UYqgpcLjvlhe0sFuqnk5j4VFkOEVTgItqx/BxTPpRcYgjvxP3fENbM9ZcB+An+MrKEvaz4KhKcXdcHY3M0lcifVIrRfqfELIH9R1gXH1D91PNGuvD++QR6Iv2h9fRg9kDI9xrfAbsiOzh9M/PW9499xa6nVF7nktsUCR2ttQJhxZXTyGk0Abg6C9hICCi8o6LGDHuHG2t5jtViwoDU5AMfBhzDp43BfnJyWI6j2n0VZZBLgqRxhuEzj+ktCsn30hARwQKSP7eQb4VTvVPsTdAP2gjS+z7ZLJ2C5Toa8ow4B5lWLf/DloAa00q6kWlnbRKfExyuHslYTnVt+MZImRYKups9Xf5q+bBHs7xhdWRPfXxr9JOJbDZghtXe0hqa+xLwuQJlWdHzY9CosuwL0YGNDBR9SoSBT39cZn59o6RktUDdvpkNA3T16rwGeseXaIye2bZzKjGIO7iEGClVbF4HB52WWXP1lvzLpEnv/eqPIMj7BFhYhQlmK3ldPt/xymgXeuWpsgJRxB2pVAu7TZCGPue6tI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff7c3a53-3870-49c7-53ac-08db23797229 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 04:14:31.8726 (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: DU0P250MB0948 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/libopusenc: Remove redundant av_packet_unref() 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: BlVhBy3nm0QY The AVPacket given to an encoder's encode callback is unreferenced generically on error. Signed-off-by: Andreas Rheinhardt --- libavcodec/libopusenc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 75bc491c9e..5a0786f32f 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -512,18 +512,14 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt, discard_padding = opus->opts.packet_size - avpkt->duration; // Check if subtraction resulted in an overflow - if ((discard_padding < opus->opts.packet_size) != (avpkt->duration > 0)) { - av_packet_unref(avpkt); + if ((discard_padding < opus->opts.packet_size) != (avpkt->duration > 0)) return AVERROR(EINVAL); - } if (discard_padding > 0) { uint8_t* side_data = av_packet_new_side_data(avpkt, AV_PKT_DATA_SKIP_SAMPLES, 10); - if(!side_data) { - av_packet_unref(avpkt); + if (!side_data) return AVERROR(ENOMEM); - } AV_WL32(side_data + 4, discard_padding); }