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; From patchwork Mon Mar 13 04:14:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40657 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1422351pzb; Sun, 12 Mar 2023 21:14:40 -0700 (PDT) X-Google-Smtp-Source: AK7set9w0GbVw+zLKIfHspuC9LXuPCiUsM4oeo3qd3+F1qy4n0ldDuEVsfJI+Uox+HVd53+Tv08z X-Received: by 2002:a05:6402:1503:b0:4ab:553:75d8 with SMTP id f3-20020a056402150300b004ab055375d8mr30603704edw.10.1678680880038; Sun, 12 Mar 2023 21:14:40 -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 d9-20020aa7c1c9000000b004c0cee0afb2si6822414edp.536.2023.03.12.21.14.39; Sun, 12 Mar 2023 21:14:40 -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=Uv9GKhEb; 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 B77D8680597; Mon, 13 Mar 2023 06:14:37 +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 B710E680CAE for ; Mon, 13 Mar 2023 06:14:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V/+nS30fHGOAZpF9gJeknqweXAFqKvaw/A0NvfM8sNNc3w0Bw9ziuxSk+hM+XSSiHcOl7ru7bQNEml1g+kUff4MBZhJ52SKpBx/UJA064qW2lg/K8ayzchZ0/srFux7tHF4ptCT8NXlD0xjPVxBhAGCRI7c+COJRr9FgiZXN+FC8W2MlRplqJs/NrzBmmtBF8yR2NB6sYEuR/oFBZbCO5kiuhNLcV6O+hROnLSvNRvkJWD8ky78/rYQbdRYgs1Q6yyd4wJIhv+u6fmnlTbZywWPrAYPvcVHxsFN+b+KC89xGXvNJWjrS2ZvS3jNxaCGxbTdHAMyGR+hNuSajIwhCbg== 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=3a6x/VS+Wpv/Jj4L4ENu/wDnLODgdvncBEkYhZH3tA8=; b=mCJA9PNNvuFmrrXccSkfbvFMpBixC56Bo0gTtQivgXL/+kJiilgNsv/g+7wpV8VqnaW0rDYEesELyyQm+pp1XDHAcOEBot/jn2Zt+7rsdV5iQZx+H88aj6++0FQW3tma+prwCxVy+Zr0EkPEMV5atfK1exM6ZqPNhM1rAqSOunNeMRPoiSnV12eXxlJ2Ua1r+Fky+FAHz8tiY9RtuILSEAOK28yfslcVJX8lvFVr5HjWe9AlFRK7AhT13FtCjayIRd3bDeFlHO31yvSa1mNW9QxnBZZIivpOp1fRQW8Z8mNoHNgCkUDPRxUBzIKO0XZNGhc86PRcy9FoX4Z0jCU8Fw== 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=3a6x/VS+Wpv/Jj4L4ENu/wDnLODgdvncBEkYhZH3tA8=; b=Uv9GKhEbadyRgixXIND2E7GxawRyPRMzTLfI2jHaI9rNi7d7B/4H6RerJvgXkZvXIJ8G0VclxGhLuhJDkXhx+vs2rlclqAbTvrd2dO87YqgMMw3mJN3ApegXdUJdFrr65005D2yz5tsqF3ByQ9rnpJ9TDmd9Sy3bthLlQ98iq0+j2Tm8H2WKRE8QOcRDPcsCRJJYmBBfW/WJZzB5yFA6giuuqortjSya5k2pVu5pAFHfwyMWF90c0yjkSiIbl2LmRlIfjr2GVf+74PWNkJl5pewtkAMreW6XmUlUFPag7HbwAyu8c1wlLYYYu9rC8FPMW4x4AP+KNfGQ+jjP5FS1ow== 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:30 +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:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2023 05:14:59 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [syVIuCu1S18gI9nJPLMY2gcVVLNLHvmz290AFI59GAg=] 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-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: c3becea2-018d-4323-a22b-08db23797125 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqlMnhDLfS9U5yapy63PF6NrUTMaNIme+iiFDXsqZQsOkH8Raxmc+HlgN2paBuiBSjs3cnAH3b+ARszY2mg0USWjNmUeSQD5UP29XUJUyBokxBC8wlo2/bw7ssvJkqkG7M7MPb5gbqsOjWwSC0UPeg2uI8JLLejQS2MNEv9GY6xGmBNLcS91rr2pGkHVqtQxnTEc48LycLp9WbBisGaVmx/Y7J0TD2Sxh9aNzbx7MSrnQcnxhO8hi7Rfk/wl5IgX0cE4/pX8h4H8uPetmhn2O9XDvU1JrmMd3XWOrP40bJC0kAfawAlvW56/J3ysC0E4XCx6X8ezvkm8U7dNF+lu/EoCci/Xq54DS7x1i4uhKwDJU0KU1oCoQ6D3dZDlmixfrS+KBbw1h2tLzxtF37EI9168EY8CmCHtwTmB/nvEaAz2Thsp/+grBmT1S3lGDI8bFlkOm4j0t29qLxbT0xwpcxRWcQuTtmpFPrF4ZeenwbfCTO2kmRL2Gb2kQsTokKaxLmIyadptGWuoIHrc8u7X7nWcTRZwEjf9xhIlyUv1lnJFBWWhpd/inETzKGLRUhF0H+K3vQCElFYp5mAij+mVa5pVPg+NTbMjncsE40WmtePpUK6+7cWHvtCfgZEq+CN8unYkJxLh8GEk6nGoQhXCYjK/sc9BMhXumZY6WnaYxirb11kLXikzAf5dJjwgy7ULvauLb7BzCtlHkxgNZWjGZF5UWnzdtxaxeDRhEZhGdU/2AlvSyB2q8RuvqdqyIG6dDM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wxs1Ax0cvjYQeClzra60ZZW7V4jql7PB70LmpXjYP6yCXHgD2T6jGPdmNofJ1gUPbjFGWwMsQJK5FnmjX1OoeaBWjTd7tfYOzoPZMYOA4psGrKkqb73HVgIBh7yBaG61xsbJNO6o57QvrWH3fbwsyiP5UkvXtEA/LvyN0AjcBV7qeVyz1Gs4fU/KzrGDK7vnmBDJOK3+7hRxC80OKT6dzWeUAFWjh8QcVRbOyyJ7ZN+7vjR8FMucqLyr9Ax7wku2SswH3QfIABMS+Xj+EgihhaTAK08WNu7DZoUbepq5Y27pvVCmFOszIJgn5l4ACtYNQhzBbNGG4Zx1XZjP82XP14YpuG1mu4M1m6xKVodAlPVGM8YMxgn83WnY8y0BNYY34ZMlPbtiOfdRtyn7mOnC4sfDmWyFUVVCb6VjHF7PFwNYjVQ6W/TCJYrga3R9J0FoPoQoDLhrFM74NjkILS47sSn+/sM90HtvZXxdRc9H1RzqciUFCZEoc9zHc+RSo7ofWzKUCmCtLXoHOPYTOri5UkrthFtweNAw0uiwgNy/6Rbg8bgEX0PcQFCIO+ox2uSNs0oKDPcPQxAGvH4jjnLcE/PBzcAOZkM5ToaheafF7HK8KEsDs/XwEZcamhhLrcMfd7HZfAE1yWvfcOOomumr+QLrn5mVg0863hi48W6wtEY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J3qSO7PriUs7xm2RH20fWV0QZ/YyykmZ1PbUMd+FzZeZKx7bgqLrNQmeuHzLwaAM0h3fsiooB7Ed6lNFFHwumaj8Vv1d+p83ySlLp1EKgd92De773xO/FjPOR1JoZZMqedFWUCVewWHKLV86H82T1o+zwq0WrG4+lMFM69lsYtVn9Yria+hrkyr/+8rXSWtuKbD5wXOXZVNgdDCJCXqeU872CbTv2cvt8vv4D1aHfRdfogIasu9wkX6wERaye5iYtzjws3AvhOFZBJ8GLa28h4IVY8idJBjpve29y30zxVncrlPZVJuUL9KRKIi/JayYkHINxnHQDexXKVWdeUPLN5oPQBRr1JMvPbRPNBTHzoR2B62DVSVoUQU5uEbKHOmdYVtP5oyXIy7ZaBB52uASJWpvhOaKzB5Nm7eWq2ExzvW1LaVgR4j+/uvXuJkxL7F3mmBRCl4zL+57mYbUGHLiB+9gMvuUg9drvGgcO2XFGISEkB3hRRP8GZCquppTSDiDdtV1FBE2Oxf6hJtn3VYwbfmz+9UDvz3V7myOJKRDXzYxgJu3ZN8SmKkqz/74XbzkZ/FgBxy8eRknK0HdB0N5l2Cm4T6ghKkPiIABCa9MYKgHw6juNSVlPxOPYd0GyYM+G3/AFAPCrnD5O+wA96dLMVmoiDryJisv3gR9yJlwh+pf8k1ZXgkkJUf04Ohn5+MGo67fIo+PwS8GUwn2p0F4YPcLoEw/rbk/uKjnJK3dU7QzOKuQfw2J9Y1BO1piPRCWjlWd2mrUmveWoo13oyzvIBfWDlYEao4H7VjNzPL26uNdLgyNNvIlkzTbPZS9mb3vIiTrN7r8xwDlSRXd7PLNeGwrytKa4B42PbXwCSBG5u5MvG5+7B76ROvM9Rvw+lTyvYI3FRWm24PJOU/l/gtP7v1EGPBH/t03LjnhohNKmOb5Jf2EnuiYZpwUIYlwqBCjEf6XNcg17CKzzUvZ3MDUHwMAtAVN9zRl/xbqQ64zxuqVznodGfA/k4Z12yEE9Qh2M8lvt8TXnOFeOmt7gFxPpp6WjqGxZKX/elwklglpNNB48R+Xlrz1eak2Amqm/qzEA7plaR2z5+XbIVA6kzchy5GsdimbUJ97Az1uGFjsuUUkH2j8bvmQoUOTmeAzdwwmvgEqra4mwdmBjSvFVgJBzNhKje2Hx9SdbqeMYtQqr0PbQEldINoEagZRfP2Han+z8xTzQ18qwGQPSv84k5BSH5S1Nh4PahQZPQc+M9sj2I52fCe9lOouSISmWLl0hdSUUfiOvyyxa7+MLIG7w9UI3/qtr0Timo45pCPV2HOWYeEsV6YMWBqaHzepFRA1T8N/ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3becea2-018d-4323-a22b-08db23797125 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:30.1406 (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 2/3] avcodec/libfdk-aacenc: 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: ElGBPslcBMB3 The AVPacket given to an encoder's encode callback is unreferenced generically on error. Signed-off-by: Andreas Rheinhardt --- libavcodec/libfdk-aacenc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index db5b0841e0..eb97e0fb41 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -475,16 +475,13 @@ static int aac_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; 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); }