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;