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 DF68D40EEF for ; Thu, 10 Feb 2022 11:23:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E30E68B178; Thu, 10 Feb 2022 13:23:54 +0200 (EET) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070077.outbound.protection.outlook.com [40.92.70.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27CEC68B046 for ; Thu, 10 Feb 2022 13:23:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WXZO4vUf1wKdoJ0gYH2A7rCpII1m+Fwk9ikiG0UnitkGzGQMTLeM5uDA/0+ShSuFdRIk1M9Au2ttXd15TnZ2BqpnMoChaJrWJpIpZbgCPLXUlWzqKrfLCskoi6YxDQovlLfpSTGVwk36Q7M/bE52TaVSjZyGOVHV3VCC2Gh5fA2dOKUZZZGtIRLjE/SqxQ4ZL7y4FS7md3dHBSFiiPelwbh/RJnYAIpMWxGkg1aIwu3LqWHdA2kXj/Pv1d4Fdx4IhI0W0JQFji+GhUW3IZZFbLTPgihzy1Dz0B97YRwUS8++6mpH728zP7FF6CE2BhUqUFALbE/kLmQmF76fK4fRDQ== 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=O9zX2DlVJkHabWHKZOpA4uYrx9RfGWlSeCjH0zm5AnI=; b=AIh12XAGu5M2FU9H3aO2wFeJhRPI2h2R/Q4nhK9Xkh+p+VInj0jzedIVdZ2L5ia0JQlqf05AIsKOal0Xmmg0UsSoecxL3zaezH3qHn/kotGmzFE8XMIIvjc+RzFQ9eD0xaOOZNhrPSCrtFo56SricnnXgYkZbPD3QAGpGUijTtWOdCSWBF748RZgqZt/6Yy10DHetrLA2xI+XQaec5SgFfGj1jw2/YWpdR0+pFZK06mEfrH8+ozNl5iTaAe+nxqeNlUuF7YwqWMJeiRsNq6G6zv7DJtbZ0WMsV5zWOZ70uEtfIZbEcByEnh6yZQULfovhXRREPtz/ShwupzTLVDVBQ== 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=O9zX2DlVJkHabWHKZOpA4uYrx9RfGWlSeCjH0zm5AnI=; b=fPDAZGyGH8/6LWdEVz7yXXTJbQW2r49/tv9Vq4BxO3VF1feqvJ730AQ4mYYW1zpiVMeUMJaEfuMIwA/VYYGdrPuClAdIk3ippFIEYk/L7TmtYHiSEe8KGnaauL0H6wZQDbEPDAbtmrm2QpvHCCFFLeQQ7wT2l5OapwXt/xl7NElYC8zVBEmctJxNhTP91qx7g3MYQtLg3ijbx0N0vvBfkQt7iD6wACDEixvJMrEaItKjtcLHJSWHcIxfOZL1DR0aV6QLwFieIF5tJpQeKzD+569eHjAxPFKVz60L6PGpAwd+eUsw51+LnPtsW5RL1wO6xvQwxbf4qgL77ojHq6xJDw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2996.eurprd03.prod.outlook.com (2603:10a6:206:18::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 11:23:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Thu, 10 Feb 2022 11:23:47 +0000 Message-ID: Date: Thu, 10 Feb 2022 12:23:45 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [8OycICFwURzseM25ATCAjtBaHejUhVX4] X-ClientProxiedBy: AM6P194CA0080.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <2478e9c3-e6a7-5340-38d2-cdd0a3246261@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4190b4a-e629-4b00-7d79-08d9ec87cd4b X-MS-TrafficTypeDiagnostic: AM5PR03MB2996:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QtxKY2t4oMPraVWKntFzUIzhRo+6sIT1mPK/h3uiNWUmFe6ZejXq11hRHpTipdnKdFxYHnfX2M1scdkr8MdxI1n0Aq8ECAAOWj8zKplICgX9C/HmRIWSMKPNMHKzX26mrbNb9N41CNPXtXd36TDzMOinTZvUzrbref88lZdHnFrqzf/F8p1bUvZ/hC5WCwlDokkmZPHceAZ409lYwLvLhUPq9H/braQPJ02EUYY4nnedtjWyenpzGf1BFVozK1We4M76EW3cIeKMzLZbfwvRzpBUU8HQwsfeAcrMI1D9k6s+NBxQHAfpBj36ccIjenCfcO9HdyKYfcMD4N5AC8qfmgBLvydXeMsIVw12aZABoddF13GHEVYdmDSHL1/GVCqqlkN94r18RI4/JlOyM77NskhKy98GpRXhym+apvTzxA/6DAyaLPkxOSNitTdM2fQIUvfRqt+BUgyiIO14x0yMWQjUHwIjss1IHwxVe2iFrv4EIdfjAaL+wLaHEcZr/YuVFKaU/pC8FMS5g/6rDx8JsnpN5b8sCAtRAbdKnqYNc4/suUrqrCcJOjd1wK3OLudtJLuiR0S1i5BDO6P9vsLfKg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q1VaU25tUWs0bWo4K2tJdkNGOG1OZWh5aVFndmJjUlc0SkhDd1ZXdUdraFhW?= =?utf-8?B?QXhWUnBnUDlOWng3bjZmZ093MnV3Z01qL01GMnlFaStFTTNvVGY5WHgzRE1E?= =?utf-8?B?M1hQN2tWUzd3TW1wSmRjWG92WWlWR1FKSCthN3B0ai8yOHBocVNOTm85R3E3?= =?utf-8?B?aC9FUTVTNzhmWkF2MU92bTc3UEdHUlk4dks5SVprV29qVHpTK0I2b01kclFj?= =?utf-8?B?MHZPNjFiTDF3d3c2OXdzYitpT2NTNE92SUMyM2tEYWZYWU1XU3dvV0piajZK?= =?utf-8?B?ZlUvQ2lNcjI1dlFmejZVb09kUEQ3c0lrZlBmREgwcWFOYjk1SGJSUXJyU0g1?= =?utf-8?B?UVNaUHZkL2lSK2FmUDExQ0FYYTBsVWQ2V0pZR1BqNUNoWHJtUXNud2pCTkhC?= =?utf-8?B?ZGJFRU5UMXNNY04vSlRkREpMWXk4ZVNLY2VkVERxY2RnMlF1UjQ4VkZOcVpv?= =?utf-8?B?K2d0dTUzZ005NUdJbnlOaitITUxMbEpwUkpLeHo2TWRuVnBSR2xObzRZMEhp?= =?utf-8?B?ZkFtaEZIQk9hRnkwc3JTNzZ5M29DbDNNQkNveWdVYi9JNHh5bm1lMUpWZE1D?= =?utf-8?B?eHJMZmNqTXpQT3AyMlFBMnhWUnE2Tk1Qb1FxLzBRUkxTelF2N3BxWUJQRWEr?= =?utf-8?B?eFdxSE1xaFAvcGxjKzdpaFI1VDFnMDBaaHI3QXltaXQxdXZRbDlxaFJVZkRR?= =?utf-8?B?cTBsVldZeDRtNTZzeUlybFQ2Tzdja2RtMzRKZERNTHE1UHcyYTIvMEJSOWV4?= =?utf-8?B?UWZnU1c1bzllRVFmaW9rbXpmRHJxV1FvdTcvdWlQUTJ3V3J4K05KZWlTNUp2?= =?utf-8?B?ME9ZVXZXdWI1T1JFeTZyMEFTOWZmanFVcUFuY1kydnRCK0VTci9icExycWl4?= =?utf-8?B?RXZkenB4bzZnUHRuOG83ODVzeWsxdWVSQ3Z1RXlZR1p0TVIrN1gybjJLbzNX?= =?utf-8?B?eW1RaCtpdE9FTWlsQW9LTHgzeW5qTVFaenpoNWpmdHppd1oxT29GcGtWcmZT?= =?utf-8?B?b0cvSlM3UDBWT1JqLzJhQ2FYamwxdXZyZ3RLU2dEZVhoRWpIYU1aU2UwSGpz?= =?utf-8?B?bjdhNEdrWERjTS9KUEFMcHhPZmM4ZXRIOXRGV2gzbGcxVWRrdmlGZnB4ZkpN?= =?utf-8?B?aHdOSW54V1pJbEJLTEtzRFNJczVUMEx0LzI1ZGgvZ0N1R1RTa1JueGg2ZmJU?= =?utf-8?B?eFR5emlFMDN6dERyeHlyTmxLb1ZMQTQ3Nkl6N2loVy9pVHg4ZTFRd0xhOXZG?= =?utf-8?B?VnhMM0M5YW56VmVjWGZRMjlUK3ZYSktMT2MwVEtuWjZscTNOdz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4190b4a-e629-4b00-7d79-08d9ec87cd4b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 11:23:46.8952 (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: AM5PR03MB2996 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/pngdec: 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 > --- > I did not add these codecs the last time I searched for codecs > to add the FF_CODEC_CAP_INIT_CLEANUP because I was unsure whether > calling ff_thread_release_buffer() on a NULL frame was safe > (it is). > > libavcodec/pngdec.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c > index 3c00007907..6a22f8d9d8 100644 > --- a/libavcodec/pngdec.c > +++ b/libavcodec/pngdec.c > @@ -1696,11 +1696,8 @@ static av_cold int png_dec_init(AVCodecContext *avctx) > s->avctx = avctx; > s->last_picture.f = av_frame_alloc(); > s->picture.f = av_frame_alloc(); > - if (!s->last_picture.f || !s->picture.f) { > - av_frame_free(&s->last_picture.f); > - av_frame_free(&s->picture.f); > + if (!s->last_picture.f || !s->picture.f) > return AVERROR(ENOMEM); > - } > > ff_pngdsp_init(&s->dsp); > > @@ -1741,7 +1738,7 @@ const AVCodec ff_apng_decoder = { > .decode = decode_frame_apng, > .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), > .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, > - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | > + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | > FF_CODEC_CAP_ALLOCATE_PROGRESS, > }; > #endif > @@ -1759,6 +1756,6 @@ const AVCodec ff_png_decoder = { > .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), > .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, > .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_THREADSAFE | > - FF_CODEC_CAP_ALLOCATE_PROGRESS, > + FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, > }; > #endif Will apply this later today 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".