From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 49AB445AA9 for ; Wed, 15 Mar 2023 16:00:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C89D468BE2C; Wed, 15 Mar 2023 18:00:13 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2042.outbound.protection.outlook.com [40.92.89.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64B2A68BC86 for ; Wed, 15 Mar 2023 18:00:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aLEIB47MOJ66FFiUCg0Ar8z9OME1W2lPSOrhQq3a3BWEdMA6EcZMHMOf70AV23F0mbjVdy2+XJFtFgEoh+wC8gP+nO105Glcif5n5th8WXeIKs2+dKAbnk6e8YP9D7FKMMJeW8tnfZVkjZntLOhksPsIuZb6lT6zeoWZ4LtDWiAU6WFosQtnjz6NU2XGwQZNJSYMbJsyTCNnfQ/lMYmBsvoahL71necHrs6B4VYQnfQE9TTBLFzsc/+4xFuB8mz7o9AJSqWW8nCI+uzBlmRq857aOh9+20zK68bMM/i01/jxO/glJ2w0MOyRRAnV6ImOT8IrH02HD7dwGNCU9eq6zw== 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=ZzNUt/KBRWXb9JB8ein9GQPyH6htW7kAG8cb6lF1zLQ=; b=HiF6Q62/JDJrDIXNQexNOXbCvbUJMLBWHlMSKMe1OLoha3dkIJSlpLakanz3/rVRdOY6bW6IEAzdPdJdNUOE7p+MpjRVYb13CrkKTW+uTip+RTv85WfgQDzp9O72uF4mdwzJljrZFiBGnx0STISqpKRfSrdYdMwYzsNyAeA0KO3O1RJIe8FPAdnZFcWAypx2vqsvG3UOf0FuBlYsKOVUqHJVHU3TFkuoocXmvFGC8j4a6HZT6G91jru21O0AZkOfV+TULqhif3OZX+6aOLxK4hKy1SiOiFnY3EnGGMzmbRrzfw5Vva5jEfqIZ7Z+MX9ZFE0pZlUaXx5Try0vwO/1LQ== 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=ZzNUt/KBRWXb9JB8ein9GQPyH6htW7kAG8cb6lF1zLQ=; b=j4rLL4lT8qwgqJle9vKyal05CxH0IF+4evOJnvbcwv9rqEFLTG58VSYzSlH5jfsImnb5JIARm6ITvzwTCYbVWP2M8DJPRzcbg3u3TXiKSn8jL0CASO9k5MtlAcv2j5OesTORk6SLDN4AEWhQ2vDJEe7gkrppJ2h3UYVgOcdeQLlrrOE/DxWN+hR2/mvfavNJz79paXP3lSyaDdHgNk8de9mj9kU2BpVlJc+uBOhGKLpyrh9CfM23OTvG4EOtOdH+Y4hEOcn+fHeUyRyuSvpWdAJv/SN5UM/axhc4UB1nGwwDQo8cLxG/2FtxO5McS9/nr6V3/OvOAeIKRcSKx+MUmA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV2P250MB0731.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:a8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.26; Wed, 15 Mar 2023 16:00:04 +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; Wed, 15 Mar 2023 16:00:04 +0000 Message-ID: Date: Wed, 15 Mar 2023 17:00:40 +0100 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [N7Z9f+JIIR+n5A7ypHQeK1MtQB39amv6G4gYz+zCrvE=] X-ClientProxiedBy: ZR2P278CA0048.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <51852062-8d44-0bb0-5cb8-63fcee302527@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV2P250MB0731:EE_ X-MS-Office365-Filtering-Correlation-Id: 79c8cbb2-248b-404e-85ce-08db256e576b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K3zXa3Wfth7EjCEXTFO4iTtEcDaTrL26ZjGgZS+m9HQwyAqrQ5ttWShXgni2cp5gqdqqJXeAKh6Fwmv0MpIAoAgTrvVuFYSrIZkzVX18xyZmxZkSTJPPr1qxhu4vQbIqdCXiVaWsPGPzLiyoIG7Jl/WurRb5xWY2IA1h7olHXij4v81GuB41GlCg3DS2rcVL6+ukMq2VaSclZdMv6LqMsjtG77wV6gIwQxsPvvSCJV+ippOvWBAYrHUVTzyD8aWECuiuHffhtPODKN8A7ioJoelTAWBUXjRafgrkvE68j3tYQpARxX7UUXNOJlwYsxl2z3jzVpgj3BzYd0V6JR0Cml/AuncFAPBUZrDztocRKeLRn2NSwfERO0mMVu9sojo1KmMqgRc0WvpOY0nT8j51IrU1oRCHVKtuu+vOK/0g61FlaPG2UM8U7/MUJ3D06aWSko4Ja64/CRSoBOBTziOhHT1p6lJGI1s7x4St7faeYSgvxMYRAbtizfnJ5yjlY9VfbUzIji8+aAETigJkI/qMwvfdPzEaTAGjDfsbP+1aTgjLjpETGBWcYBY9JuAdMZFdOBlSWCwJdol7ULXBl5syPgrcHK8PMawGGAFjT9zyzUCtiZe1LeAyU3K4vGvzUquf35DfGmefB0bIjSW5YIQFfA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MGFsUFVDcGp0N2E4QVBvWWNuRExZenIyby9pbGRtM210dUY2TTRnYnA2bnRF?= =?utf-8?B?SWxSaE5oRllNN056SG1tVGJBaWR5ZjJIcDdWempRUGhzTDRyNFFyZTlsa3R4?= =?utf-8?B?dWVaZU5ZNTNjVTFYUktKeHpwYXBSZVNGM05rVDQxRGV3R2grVVdwZmFvTUtZ?= =?utf-8?B?QnNqbFlxamV6d2ViYW9QVEo1WS81Ykh4YmxrcVZUb0tFWmdaVDlVanZpdjg0?= =?utf-8?B?NjNGdGc1TEEwM05wTHk5MmwyNWNNM1pZRlg3bGdNZmRmeHY5VUg3bVF2V3BT?= =?utf-8?B?S2lDWlRLYnV1SmNDQ2hoQVNuRXErRkN4bGk0LytoaHIwSnNmd0NaWFBSZk52?= =?utf-8?B?cUJiNVp2dmV4MFFDYzFPWi82T1F0VmRLRE43NWxqbVRrQXJNTCtCbGkwR09i?= =?utf-8?B?Q2xuV3lMdFdqTDZsRW9jZU9hSytHUnVBQWhNTzNIT0dlUzJnRjREelN6Qmw1?= =?utf-8?B?aXkwWk9PVTB5OS9LWjdkbjdtSldYQi8rbkNlaGJIWVQ5SUpUWit0ZjI5S1Zw?= =?utf-8?B?ZCtlVjMyWDY5RnZLRXNzNzR4K0k5MWI0SXdEYXhlazRFd1lsSFhSei9qY1ZO?= =?utf-8?B?NTZTZTk3Y2VxbDF4ZXg4ZWhOeEVwMUdpUEp1Nlk4ckp5UVc4ZWhZTmt5NDJK?= =?utf-8?B?TWdPcTZBQ3Q4VDhER3JPWmxBU1doUXhDM1E3ellqd2pISC93amk2M29jWTNH?= =?utf-8?B?bS9jWUJ1cWs0c3kvWXpCUXRWWGhaR0FMNGxsS1B4d09yTUdiMlZTMVp5RXFx?= =?utf-8?B?QThCMVhxQWJLSm5SaGxLaEJFa3JYM3ZiSXkrSCtYRXI4NkQ5cGdMdk9IQ0dG?= =?utf-8?B?cEc2aHhyU2xUcGJnMk1hKzM3UkJNdzFMd0l3V0gwREZjMEdCZm1tK3c2TWVH?= =?utf-8?B?QXFlelM5ZXMrVXhHZENpekdzeUJaUmV6UHA2SnN6dlNEeDdFd0R2SUlid1Qr?= =?utf-8?B?a282OHpmdVNpRnRFSnpoWHlQcGhONDNUeUp4dWpTMXUxblBHWWN4N256S1lN?= =?utf-8?B?R2VKUElOTm85Y3JZMzN4Wnh1enlocVIwZVQ3RzZCMW9mbm0wS2hLMGpvZXln?= =?utf-8?B?bzkvRE1mTTZDQlB4eXRGVjZEWUhnSGRtSlcxUTZEaHY1L3BZMWs3eTlIT3BS?= =?utf-8?B?bFFkVzZ4T2RVQTF1cldKWUtsallZREFZK0o4aGpUaXRhcWxUMnNSNGo0Y0hs?= =?utf-8?B?b2o1bzIwblJacC9INmUvZ0I0YzZUZXIzSjB6eUhQRjB4S2hGUzBoREtEN00v?= =?utf-8?B?eUpwRUhRZFcya2VXSnE3NUxReFdlbzZuYUtNc0FlTEZUV3gvOWtXRDRWSnF4?= =?utf-8?B?d1ViOVFXVGlyYWc2NWJmNG1MMWRmR2dCS1BCNnYrSTJVTFJFWldYTzhYWkpM?= =?utf-8?B?K05oem1USUthQ25xV2ZxR0RELzc2VitZR01kUXNFcUtLcE5TYnVINXFURFZK?= =?utf-8?B?WFJiOHU5aVNPVnNvZVRKR3BzbTJ3T3YvZ05uNTR3TVZ2RURHc3FnK2MvcG5j?= =?utf-8?B?YjQrTzFvbVpOYWhNOEY0S2dYbDE0czlhVlVSY3cvTEc1bmxMbDJkd0tHcjlR?= =?utf-8?B?RDhnYUFSWDZIamlHWlUzZUh5OE1qQm9FZEltalFjN01HdndGNStrUWFWcC9O?= =?utf-8?B?ZFA2RnY0a0VQUFV1aTFNRUhWRG82Q2xIQTRkdC9pbTI4ZTNGWXNCR1NCUzly?= =?utf-8?B?MkVjVFZJM3Z4NFNSU0wyL0MzQlVvTDREUlQzRHBXSFFtdU80WVFmSkhmWnNQ?= =?utf-8?Q?Z0fi5XPnp9mSgPP+V0=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79c8cbb2-248b-404e-85ce-08db256e576b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2023 16:00:04.8863 (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: GV2P250MB0731 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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; Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".