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 6E3B048EBF for ; Thu, 29 Feb 2024 09:34:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2ED4068D0E9; Thu, 29 Feb 2024 11:34:23 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2037.outbound.protection.outlook.com [40.92.90.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EFBE68D0A6 for ; Thu, 29 Feb 2024 11:34:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kLaVSf/LS8bRK3uFh6i6ZvtA78yFJdDGcY+7Mtjlr6SyQHEN6Rsk1HE4pXnsnN8kG871X9yFp+wF/00IttR4381+Uqk0wkHJ6F0xhSKZiON4jNdABQY6Fbt/WYC8JyX83/8Iq6w0PI71Ec4yZN/VW4ty2fCG+/ClD0RR6XFJzP3OanAA23majHnMrXTLFos5r1dLzPVKH4NPc619OjAZg4SsdtzEPY8FzWdNYkweQwZhgMrmEmZ08v58eZiZEWGHOabXdRsZ/sZFJ7/ifxy8mjWIDVjDC6rYZMr0nAOz2es4KqwsTTbJ2wm9RF8WHQ3uIYTAx5b5jGqUj5G+MI5vsA== 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=yQV6pajtYn82z4ClXYebXsIYz5X8XTivtB5M5W2KObo=; b=ZAZ6ottUTs9knNNcOtRcflN8klCYXW1sH1qJysPthFsQGnQXM3MJbQ53BkLwV0p6XUL1yurJFo+HxoNn+Gw6F85t1V6aVpSqHuWlAOLb2NwET0hsMZOYK5P2MV0iHf5sDAS4xfPKubdcQO02l2tjQqcFpuHrwe0hOsscxvuQFMq0nwoi5RFRrN/jqrRElCjHUzvTMJw6fR+kFhbSCFG+S0NLfvRWLN/qXNTjD9wfhYNdjDM8VjSHpUKiBftmHQvghLxHG9xMC5rra8VvT++EaP1kss+slWla24UV+G85CwjG6Ea5qy+LIncz7uzyvkPUH6xhPJpQyYjp/rQTWXIagA== 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=yQV6pajtYn82z4ClXYebXsIYz5X8XTivtB5M5W2KObo=; b=ud3xJ3wKfkzmRqmaXgazh1ZBsZoZgJr6KoCYa+pfJO68ziaU1+yGMLfPrxt+PFw+GgCaRDUFEPDhn8lheQUpTEGsstvLojipHZ48N2+eYaFCHXoORBE7AqZKxL1jNjqy9wDDzcKNV9yUaMUimZP1rlsdFJJOVLiXUIUluBs6HJwlZ9P3ELXVRMXSqHXffb7Agjvu8FWrMQIU0QRk+CgOGVw3XCokPrYJi6hH+jOTBF3Lh5FJfh1yN/EApDr93jGDQdogM9LwWL3Ar2JIGentkFPqi0DHRxXIzPmy36sy2QR8OZby74/Lpo1YEToo/gNDm3oFJdNqNyBOBdRImRWe/w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0225.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:178::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.39; Thu, 29 Feb 2024 09:34:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Thu, 29 Feb 2024 09:34:14 +0000 Message-ID: Date: Thu, 29 Feb 2024 10:36:15 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [bvMJpBzMWqDVAaM7gxqVd4jXeQ4F6MSTBij/oEuxVMg=] X-ClientProxiedBy: FR0P281CA0131.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <1714fe94-ed98-43e0-a4ce-27181fa15894@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0225:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d792fad-9e31-4229-0864-08dc39099800 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e82HQ/eqB869uJXfruFda6AJtyemcREhxjI8BQFdX8/1GRw+xeZ20skUnb/nMJ9zISbH1j/iYIrADTHbLNTbeE8zlXc4lGd4gAlOpqXUkSIjMWujqkFpm0QaosJZyRX8XQs3HOi2rigD1J0GVoXJlmmdljWiPP9KpsyNtENCqgIX/Wn3viJvlf6pUZB9GjsrV7N8AKlqM1WskgBQzwhb/NwadtbUKEwJPCAJlSc1fEhEFe6bauvLnKDGzUZYlsclTceW4TzSOCNr/3uB7LUJ1jAeRegAngTqwDOLEVder2/v3VpmXiiZOBpERjC6AxdMOmyItPvbZZyw6R8RJC49eycqgmSw852jHIN7ovB1TP3d5XhzzhoHZ5ZuJIqwvOx2RxiRTBbAtW58xtop6V3jGZZdedAzWmUqkzTP+o+7xX8tW1FKiaCMA0qgkiGTCpyzsni62+ZD6D/Sn/qimkaaCPHV5pJRaBmxScfRdn6D/Na3HFmEYVHpdVBecKahzWEzAdHvaICdBwB4I+XBmVURMXhon1wPDRivVScMrnzQl3d36nKQ5DSbbfr2Rf0tpkuW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SThOOUNPbWVmZ3VDSUVtNjVtdzV2T1VPNEh2N1ZMa09udDVtR3BPUm5qN21w?= =?utf-8?B?TFhmeHJaQSs2NVM5cWNLUis1SWFXYjVMK0ZKeC9wWVJoUG1DcFlBcTQxQWhl?= =?utf-8?B?czNIOFdlK3pBZkNCOGpIN20ybFZkd2haRHNzcm53Y0pVWHE5aG1wU2lwdE5n?= =?utf-8?B?Tyt0Z0MvR29waXlWT0hNMEs4OEZWTEdrTVlMbEgyNXZSN2NOUlZDM1cvbkRw?= =?utf-8?B?UXhRQjdWMmJLMGZ6a0pDdzc5TktqT05rUG44eVlDbCs1YW5uQWVUQUNScElq?= =?utf-8?B?d3E5ZGFqdG1vMGVQRUYxc3YySmNpaHJXcDhJYlF1L1l4WitpZWpsendGd3BE?= =?utf-8?B?ZWZnNG5LOFZnaUk4RFJvZGh5MXRwUDlDYVhJbXhObkZUUnA0Z3NKU1JXbjhv?= =?utf-8?B?ZDAyS0d1SE9qOTdVRjVRTTN0YUlWQ3JoL0ZJMVRmVlpWd3FGaFI4bkN0SjRN?= =?utf-8?B?QkxDNHRFK0ZXOFVKMCtKQ09VMHFKYXo2YnNzU0g4eENGTm1sdG9SQ0g4S25p?= =?utf-8?B?VTN1OUQvRnNOSTN2UzVmUEUvRDNxdkdxUStoMTByUlBjQVlVTEl1bzVQQTd3?= =?utf-8?B?YURFSUNCNCtMMHdiaUtNaVU1aHV6SlYzODVIcVJYaDYrZ2o1dDRIK0lad01y?= =?utf-8?B?Ui8vKzZDTDE0dW0zUjJDQU1EcnZJNmFlVVVSbHFHTlpYazg3M1lUKzFhMW45?= =?utf-8?B?Zk1qN0JoUkNrTjNzd09XQ3JmZk1Wd2p1SWhnM2hZdFY4bFd2Ym9mNU4yWU1H?= =?utf-8?B?VGlUalRYYVdrRkFrRVRqajAzdGdkR0k1VENmMGZNWjRmZ1VISjJMUUVLVnhu?= =?utf-8?B?ZWxWU1Q0QkZyc2xuZ1B6TzdscmJtMnFCN2pBazRYMTA4Qnl4a1d6NmxRenE1?= =?utf-8?B?Yk8xdGhtN0ZUbksxVSsxeWxwZzZKazV1QktuWjV1elRUNWcrSmtsb3hqWmpO?= =?utf-8?B?SlpYbk9FaEtzN1d5QXg5SXJmMGZZMHd1MVhZUnpLUVh5VjB6VkJBekdCM1BN?= =?utf-8?B?U1BwK1h1emozM2J4SkJIdHUzaDBPNkRPd2xXMGF4TkZFL2ZXQmxMRElyZmNs?= =?utf-8?B?Ylp0VEo4V1pPcnB5cmJ2UGV2RUtaTlg0ZTA1Z09pbzBzS2s0UkRlS0hjR1VR?= =?utf-8?B?d3FoWE8yTE5DMVJKR2VhTVF5Y0lpVG5HSlgzN0s0bmp6eU03VHRySXJDSUxC?= =?utf-8?B?b1lGdG41ZTltL2t3VGdwaUlsekMrSzlOYVpxZjNWbkVlVXZ4RU0wb0RWOXlq?= =?utf-8?B?SUVQMnFubGVmVTM0Qm55SkJadmFwNzY3cnBCV3JMTUNnaHp3bm81NzJ5V1pY?= =?utf-8?B?ZFlLYU85TXczZytlMGtGNE9kOTQ2UUgyUWRzWFBlRnFPZVVTdHV5MGd1R3d0?= =?utf-8?B?aFdFQis2d1lWWlZRK0RZSEcvK0ErKzQrZlFORlNuTG9pOU5ZNXlqSGdha2NK?= =?utf-8?B?VjFIWVU0cWZJQll4TWZldy9QZ044d3ZNcU5yNEdPclpRVnhrUnZVSEpWSit4?= =?utf-8?B?K0N1Wm5WSCtNUURIdXp1aUUrZTFFSjBtdmRzaExkeU1UVkN4NGlYNExpUGRZ?= =?utf-8?B?eU5OVlExQ3F4bkx1S1cvVzZwQUNTbGJORkxNSDhPRzlFTTFaVFVHVk53cUVV?= =?utf-8?B?cTNxdmhYNWZKbzNiclFRZXB5T2RDL2ZZcXBka2ZqZUNPVDhhZUJ5OHFyMU9V?= =?utf-8?B?RDFDa0cxZ1dFRndOdXoxdW5oYjZYS2RSTWR3QWZGZ0lNK2tJUFJxTU5RPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d792fad-9e31-4229-0864-08dc39099800 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Feb 2024 09:34:14.9056 (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: PR3P250MB0225 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/mss[12]: Cleanup generically on init failure 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: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/mss1.c | 3 ++- > libavcodec/mss2.c | 9 +++------ > 2 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c > index fb5fc34ea1..5460673133 100644 > --- a/libavcodec/mss1.c > +++ b/libavcodec/mss1.c > @@ -206,7 +206,7 @@ static av_cold int mss1_decode_init(AVCodecContext *avctx) > > ret = ff_mss12_decode_init(&c->ctx, 0, &c->sc, NULL); > if (ret < 0) > - av_frame_free(&c->pic); > + return ret; > > avctx->pix_fmt = AV_PIX_FMT_PAL8; > > @@ -233,4 +233,5 @@ const FFCodec ff_mss1_decoder = { > .close = mss1_decode_end, > FF_CODEC_DECODE_CB(mss1_decode_frame), > .p.capabilities = AV_CODEC_CAP_DR1, > + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > }; > diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c > index 2237cc8bb1..d54a1220b5 100644 > --- a/libavcodec/mss2.c > +++ b/libavcodec/mss2.c > @@ -886,14 +886,10 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx) > c->pal_stride = c->mask_stride; > c->pal_pic = av_mallocz(c->pal_stride * avctx->height); > c->last_pal_pic = av_mallocz(c->pal_stride * avctx->height); > - if (!c->pal_pic || !c->last_pal_pic || !ctx->last_pic) { > - mss2_decode_end(avctx); > + if (!c->pal_pic || !c->last_pal_pic || !ctx->last_pic) > return AVERROR(ENOMEM); > - } > - if (ret = wmv9_init(avctx)) { > - mss2_decode_end(avctx); > + if (ret = wmv9_init(avctx)) > return ret; > - } > ff_mss2dsp_init(&ctx->dsp); > > avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555 > @@ -913,4 +909,5 @@ const FFCodec ff_mss2_decoder = { > .close = mss2_decode_end, > FF_CODEC_DECODE_CB(mss2_decode_frame), > .p.capabilities = AV_CODEC_CAP_DR1, > + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > }; Will apply this patch 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".