From patchwork Mon Mar 13 04:13:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40656 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1421722pzb; Sun, 12 Mar 2023 21:13:07 -0700 (PDT) X-Google-Smtp-Source: AK7set96cRs/lqOUPHfWWEbkC1uK44BisUI/7ZqA4XKFA5+Hnf1je/UqWREUWKgg/78n9xNCmBAl X-Received: by 2002:a17:906:b754:b0:91f:5f9c:5db6 with SMTP id fx20-20020a170906b75400b0091f5f9c5db6mr7990550ejb.52.1678680787635; Sun, 12 Mar 2023 21:13:07 -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 qw4-20020a1709066a0400b0092b59b34819si859787ejc.435.2023.03.12.21.13.06; Sun, 12 Mar 2023 21:13:07 -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=VPdEhrHN; 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 6EF4A68A23A; Mon, 13 Mar 2023 06:13:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2093.outbound.protection.outlook.com [40.92.91.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCD5A68B1C4 for ; Mon, 13 Mar 2023 06:12:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RXwRE11QiPxG0JMb//r9u8ya0Whg4jYNHxBebeoEcQ0jDbrvFA7ePV0YpZBvSruBtv6JDfZThHY4+gqe7sZZWHg4YICeaelFojQ9oSrMKtdO8r3652Ln2q+qk33JgCQHBNM5ncKGX4UBvzPoSumKIPnNabfKnfe20Mrtq+Qh9GnOK6LwfClz4Pg2gaC0/v9zIoMz6c7wA4QGg8yjnMU/S6Uon0bFMqqKtJ0/ESJgUy9sSJVYqQgWJGpY6TLbdJN0LL2sdKkQw1RCQNJ9js2fjtD9epwoxN00vW9aErqNZq4EMFbC0yIH4iPXCotjPFzaJozVOY12VfNmHwzRuAvSOQ== 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=CKreKxi7sdM4CsJvjr7BO8+jrc6nqGViCxfC2ogPBfY=; b=kj160qCXEbSzdHMsp+cPGMOaMUUixp/CPxOF2W5IKAzxeQupbIdjJxJ1Fur57yqPIgW6yBu3FDgsa9oFxwFDHGSbCyNeOJ3MHIjjnbzAn2yVmpbsBJY7kj/rNdgOtVt04M3/fB3XaeBmJQh2HAofFio2pZeMWQ6ojo9BYBqT+2CBQYUPEDyipHi1kdMs7KZljzLANxTJScyqm8b4LrQKzSsDEG7rdp10UqTjPtH7PBMzX5RsyAsbUxvjmUyx7MNbXGD03QPInCDHfCgXR6gkeZ5Au6J5G2pLz4z2Ahm+Jnvk9jChpwJucPTGy8P1QoPmu3pFEZq3KF41w5iOG2cxVQ== 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=CKreKxi7sdM4CsJvjr7BO8+jrc6nqGViCxfC2ogPBfY=; b=VPdEhrHN7n26A0F9KRl1rs7oDZcQaXlFjkqJ3AaUGOGUXK+YmJAGIpzCSvk5KTQI7CpbpKEnCMPq3kemDgGojWkgPcY48tVIejIOSK5Jf7KmhW+wyyqwkYDTPbSCsYTEmtyxNclqRwaFM19jPkm0vNNq+Uu+5slXrZb2ZRQLIhlVEXdKYFMD2LgHWoNJDdqwHqCMCGi5SIqK2WKWQIM4AJ2noPbfn+JJby7jIrfHTBDimAEbDY1d0fZYYgOTpz+8ZlNEGRN6j/2OLO5qnW/IdoTQnULhWatEN0glH7kfoZjNVggZ7PEPH2dfa93OGYKJtDDBGIW2YE+AHkqzYrsPVw== 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:12:53 +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:12:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2023 05:13:22 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [uadbVgjFMJS+B23O8DWanJeJf82KzNo9wLrQUXH+mTQ=] X-ClientProxiedBy: FR3P281CA0017.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230313041324.475394-1-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: 221fb03e-4efb-41c5-5057-08db237937b7 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9U5yapy63PF6NSNcXu3YiMfOAnasi/vfjXzEOZHKUKo0scBRokPeJQIuepmrHFLs9PUgaHUh9mv73Ky4IURS6lVDG8ZwNd3IxApqdTjgy/+uZ8zcoh/PBbZa33zAvK5E2P+jqbj0n8bQM5BMQubgQqwaBDKoxymYAVBGSJB18iTJZa3asahOr4D2d7wIBDvOKRZZX1fTnnF1sGqk0LguVDEgxSGgHLpoemnrXKGndey+O/8N9341/ntUI6TDfNYuQluaZp+2LffZdvDLsh8l96T0I9V9V8GsBmnIrPX4kJmHkAT9wQx4u7fc3DSgZSGGcCzNGZWBSkkJYizSRJzP5hAysnnW2VG2Bqy2gpnQGj51zGGzg6GTXon6dFIirEuilJ0m1ShS5hEOhkbDfMQ4LphL2RXwlXwmmpSwrhJI5DVAUrwCr06ee4GkjbTn/Gwk7eR4C060UfLDF0QIMPQx59EoAjyJhHoBxZ55KjHiHTwA6OFMfckx8mofMs5txiPWoTZ+HxZIHuoNNbHJEh/kSFXiW54V7cnxiBaK3tE2RMSS7xoVZ7G3M2agES5sLmsrfLJOYFuixpNsr7KYRmpAfaAPVgnsjJgE50UCv5PDkAh71tDo8NKZdBjk/Y4VBQD+kc74y+xB1WsO4x+XK9Cuvcit2cZmTLVNWU32g2YoHyxb6KSKvbG+V7XVLWcy+1W+U6wj6EiioEenCUTE1Pz9JEJdNWRpAvWe0b44wj7Gre3eKfZPPcs0WPnc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +K5hbZNqlD0q7MMhqYmwbE0gaK95IFmLSEXv3eoi47ZCOdCFlYuUxmwQsTcTvf9a2qn1QO5xi0TLFkh7aRqlWwVxAby/W/3GLySz/q0Zdh6B5z2yxmUYmjmkcftr8MCJeRngq761nM2MFkEZCwHZhbfI3zqPePi5hQLDef92qxPH7H5/iCTGqNDX4BGcUVON9GyY8xAoBwMenZCe8jMy12xoohn4XjBprGas4Dr+FSmYPPLEzlB7d0q2V4AW8JzSF9pJ7XVNBoZpgWkf0SxhY/1wky4c8bTW8SpSuS3jV9u71wnOJrKGJmuZno0EqXlq+LYICUFbtKMT33pzgUDH+eAnjah2YkdFIxUgayNB0qLdes9Jv4L/+nnifuGdQlK8lZS7G7Zde+Fj9jF/if2cW8AfD0sOMdBBYegagHdLxpGguR/hClFxegP18oIUV80Fh6fDKQNkwSERokINBR+eXduTQsJXY8yQRDCyS0HxLmXdI0IDExg7OxFlvKmWGLM78QIqdE5SY2Hdc/4FAA/7dWoQ1mh/ZDc50d7Wt5FbB1YlIWgW4vo2rKIyJGrdwdl4i1XE7Gbq5XRZd3ojBrIUdUFX/ZaACSBRv2pFeWgYBdrjL4w+mbvPbh7f/fowtIf7LtVM0H8dWFsY8W+aOhzrRgsAwuP6IUO1JpznKkSgxC4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aeSgUVQgdwqcPdoi935YQOxq76aYXVQaBopkkcbic0Stad+m+i3iSM7pWNnjKKs4ou6EyuGaSPYuqbNh3l/3LFT+Qu0pSg0Xu2Mogc+jY+op7YAfyJpab58y0KYZyiFDoyQAAetyIqMjnf8UqrsuAyeJ92e3dszE7B9SXEmPQJGCM4MZ+2kJoghKjgQs0+8OwOJ2Gjrd3fjKfq15iTh+wyN8f/DdIbQNX+aSf/3kMakPkkXCVrpPkm2Ok3VdF3EYNagXzlCaN7wrBxzxckvyHbKmqy5CxV0WbRAMOj8vYRmB0LuwXGKnL5iKd6Kuh56SPT1lWQrTsoLVt6dh5p87binqUPKRIkxN26KbB+eu6vkegSg8R/tnt1zr+eCWm5N/UxtmHtavpsc4dX2UgVvgR6b5RJ4jGQVu8cVSYzM6T+RGw3pl3n1GSwtALK5syUuNRqO4QF7GheX2g3n0zivt4i6xgenF4rlEW1IdyzV599KLIyvTu3SrLUmLsCjhTP1DDwCXoMxzcgvA9pYTow7tx936vaB1H1wiDUUJVvH4qCl92OcVK1fzc9JOECOPMlMr3FvBs3SmIr+oEY4biQ1MHPRZ4uHL2OF4coFcaGueHD6ua9ilZesC3utWcxK1WcWrIUkXt6B9TjdfMacAbFT6TQdM5uzxYxBUsyzPW9r1O7saXtjSJ2utWldPu3ReUyHpfxK1xWS4/0hjPkSA9Qcmx6yz0K1vQwMO/hLqxRR/+XQhXFimBvW3H7xcisT1v/oKxEItkEIk7VtNax2M5DsSXPP3p2owyPsb1E2vcufM/3K07MGwB30iVkD7CHjBKQP6xhWzvLuAC5nFb+BsWOE+o2dqFzH6F4ZY+ajhpEtNasJawOk9EQBb0975x2GEA+af5+HzlFU+rUSDh17U7VUHiN4dZp8pm10HAv5tH5lN3GAXH6xtWA8aPsKTeJQdDjAmMilW0jswK2ztZ7KPn0YidUXYg2pYEnurntxHltoM46C1lCGZ6yBSK780mqiH6+NdcHmyK5HKBtX7XzYYNHJnTylEalTHH66M33VhChje2ug3CCAK4faayc4X7CC8b5gODNrxhz4NT1hnPc8LyFdAO0UG3b36OxQTJPD27oJarXstzhbJq+KZAtoY64kfIAFvuX1YeoAvKl0NJJzt8SOItwGg10lx6ucjYklihdubwIz8vhH2gD8JKPXWY8baZQRVTvR8hot4hDfNJTHhpcWQl5/3bQfyfrMJFh9sWtuWBabapfsfRSknsbCQKKlb/OWQh3ueYf7zFr06P4NxbTYlaNQRX3H3xghxOLPAlM1Np01v9Ik+85ld+C456LwGJgJ9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 221fb03e-4efb-41c5-5057-08db237937b7 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:12:53.8344 (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 1/3] avcodec/libmp3lame: 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: FZQ7C31VrW0k The AVPacket given to an encoder's encode callback is unreferenced generically on error. Signed-off-by: Andreas Rheinhardt --- This stuff should probably be moved into the AudioFrameQueue someday. libavcodec/libmp3lame.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 26e58baa3d..e119189f2a 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -280,17 +280,14 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, // Check if subtraction resulted in an overflow if ((discard_padding < avctx->frame_size) != (avpkt->duration > 0)) { av_log(avctx, AV_LOG_ERROR, "discard padding overflow\n"); - av_packet_unref(avpkt); return AVERROR(EINVAL); } if ((!s->delay_sent && avctx->initial_padding > 0) || 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); - } if (!s->delay_sent) { AV_WL32(side_data, avctx->initial_padding); s->delay_sent = 1;