From patchwork Tue Jun 15 23:32:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28324 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4313504iol; Tue, 15 Jun 2021 16:38:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0nxd27YsI6Ooq7g+f8Qo0youiLEtq3oyQY08DCOeIWyMyHrWtVoHTfME3jAG21v7JZA1O X-Received: by 2002:a17:906:dbc2:: with SMTP id yc2mr2116883ejb.390.1623800306456; Tue, 15 Jun 2021 16:38:26 -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 s17si465417ejq.18.2021.06.15.16.38.26; Tue, 15 Jun 2021 16:38:26 -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=hEl5oT22; 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 0A826689F59; Wed, 16 Jun 2021 02:34:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2045.outbound.protection.outlook.com [40.92.89.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4D98689EAA for ; Wed, 16 Jun 2021 02:34:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dgFj7UHzlRwtkGo8naaWgjKBhiE0zHyFYPWmTaroapfjgidLIg3ApT+uUye0bZXQmJohcgH+zV/U0ZZyL/n0JNcRQ34FVWt95idg4GY1bPskSkIFbHKPhDnpGdZ9lm8m+Z+aSFHd7gn8VzIg1yJ9o1NnTwI7APUiyRbccyZJrmKKZNEgv5uIPqvFMKaX9MbYCflKdFVu3atX22CoS7+lGXULGY9NYgCHW4LGXoRQszNrOIhPLRxbUK6i6R6i60Ej1PNNkWHt0SlcDlOx+62pBEXt65xwSlcoLtEw6lMZQNL6ritYa7dnUqYeylzOKAL6fmboDG76i4/WqMOE9UDERA== 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-SenderADCheck; bh=1aiLYkDz8H9I004ILYpLvI2SklUHFCJYxaMxGqGnrn8=; b=jjdAYN3Ic9oHq22YENVUaWIttAs0EfO6thG/y1zg7HYskvAX6K2Vv4+11LikfLa9qXNmpI82Wkv74HJLtZwjpsBZSWAJrwc7ce+mtKOrs6492VV6fiWJ5kZN6dvorbv2LeYx4T+yckodm7q2S9BeTM9xVrsAPHIy8pFboaHn+r9Fi5G13SNlm02jKbB1neLsv1W25Gl6W7+4mENaESXeOWrp68EacFKgXITYyzlzkfSQslAWJIuPN7hDc+fWnFB8EGYUUqwGzAg2QaEq2qdjBzl4MaFY640hfOXvjo77SN08ov/GSJQk7Qk/p0tUadmpxORyZdC/AalR3OpK55GSHw== 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=1aiLYkDz8H9I004ILYpLvI2SklUHFCJYxaMxGqGnrn8=; b=hEl5oT225aDoMTKi2CmzRQ/A1QcAR+8RSKnBEVdAO4e35acIU/DXCve6YrTzNu08NAhtBu4yLfxPF2Xjx1Z1UVKBIPvrISKFQ8hAOo3VOqH4DYiPxjv8rSYsoKtfdi5Ed/sIRmemUMnr/3h2dPW62AKA1ZQUK7GDMu4PIN2bG3/tpXlhaFifxcjRAWmFJCrYr3www5Z7qIOUpl0z93biM7rDBeEqnxqc5oNdqvJ5IZmX9LwYeJJ4hFZzffgPJv3pI2zz7Zhq5si40xdXIuJJOPZeVnxJklDtDbk/47yNne1dXWlaVWz6wmwZLTVIoLEgquUgDYrc7cA03qy8AORTgA== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4d) by DB8EUR05HT247.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::272) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Tue, 15 Jun 2021 23:34:34 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05FT030.mail.protection.outlook.com (2a01:111:e400:fc0f::228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Tue, 15 Jun 2021 23:34:34 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:63823E2756EC5FE99594D65AF2876C62D032D93992F244DB87460C6050203E14; UpperCasedChecksum:42CDB06995E065589D908C92493A3057291B6F97447C29131805E0A2F00807D3; SizeAsReceived:7774; Count:50 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Tue, 15 Jun 2021 23:34:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:26 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [kom9YP6N5xPti0sK2DxWZPkYJeEeGqC6] X-ClientProxiedBy: PR3P189CA0063.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::8) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210615233243.1173928-36-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by PR3P189CA0063.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Tue, 15 Jun 2021 23:34:07 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 34eb3540-e961-4b1b-9141-08d9305611e8 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n7ChXvHkTLkiwR+s4Q/r6wddMYzSNusoX6p6X49ND2VBPTAu7LlvL7yO3qwByide6JNHsGLeY289vG91GdtnCz+wLFrfhiOwcLUWzBv+/vjjPmsttG54eQwc6YFpB0TL3xZJvGsIXejXx0CZQgAVVvO/7U3zET/GWx7EKE1hCzdJTmQusqfePe4OG7ChuQUtLygTwzZ40xv3LQ+6Gjd9qhT8VJ29rSQSGory4qdw7NvQPWO/CQwLS/TZ0YDVPO6ODCB6CidDqis84crxhRF5esgcVS7IogOErjSENYM+fWM9twd3WX4oFeeodI9xBMynzssxIPgQPtb7WfS/IHbVGzxXVO+TbFLfFjv3D3bx9qPqqJOEplqGf7rOjBJ8LOI0/7Cp+H0nUqe6+t7rJUY0Xnzro+oPy45qQCuM2O0PKmjorkB+PFaVUNou0SYlZQw2sxNe81eVqpy5auyAINZlD3jmMPknUV1IoFgElK9i1JUCbYFSm2yrEKsDOo0GePI2QQbZc6GPqPohJEy4xVBgZ/pcKJRt51R5HFKgSpeLRz34Oi/wgXAjGmFvzi8OHZSbM5mQ9Oj510LuEIb8w39H9D98ud4ncGX5TG7fo3Sz6JhTOa05ehaflnMhk+L7ILrY5lSJpCCNUk5HgQmT+GwkS9TQN1F2iChkVZJXsirjMU3HCOaP4hRJcq+W6wbOk34//mPhbQ5+BpT1QbnaKyHaiXeN3M5QvMQgik= X-MS-TrafficTypeDiagnostic: DB8EUR05HT247: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qGdbc+wib07+RgXBteFpZY3dGfvxH3HrZuaMGAueONqiVPS5HAtjqdRd791pZ/CVOzjwBEm3so63RkgcMyChmfkauPXgw4sQMdNRqa9sq+JYVJGfj6iOGCSTeA2O0g2rUe1Wa5aTKh2liCF8JFDrx2gpmpDJ73SR/dzm9brmvfFXH4H0XPUJUMQielDPVhf72rYoZrXTXoqUEHy0zWhfXh4CGHofpMhRpx43kNAb54pZWvC0Bh4wQil9CHPJ56VhSuglh66KTzbLI/IbMFfRtJq5PB1abC9U9t3FOlnGlrQKdr1nTy48B6gIs8udK0fhCWB9x6GoJp4HcgrMPC13w2RAZLlgmbly+vghZ9qzs//Ac0vKQQigsDO+sZQypmjE2eZuAU5qt97Uqcj31+wyyQ== X-MS-Exchange-AntiSpam-MessageData: dTD506UUVh7tXxXZ5rZxHzewUUakgmBJ6te7ohPG3S+kGEwCy3vQu1fxO4ZQ6FWKOZM/qcxhxDChYWfrKnZDt4+myx+G5Th8Ho8gSwWyUTzxfwJ4nGXnWh9+Ou4YDwl1li/NeDn0fhBH8CxifVab1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34eb3540-e961-4b1b-9141-08d9305611e8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:07.8019 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT030.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR05HT247 Subject: [FFmpeg-devel] [PATCH 37/54] avformat/realtextdec: Simplify cleanup after read_header 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vjS+DGjgJYjf by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/realtextdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/realtextdec.c b/libavformat/realtextdec.c index 22fc58bc99..f3876d4068 100644 --- a/libavformat/realtextdec.c +++ b/libavformat/realtextdec.c @@ -123,8 +123,6 @@ static int realtext_read_header(AVFormatContext *s) end: av_bprint_finalize(&buf, NULL); - if (res < 0) - ff_subtitles_queue_clean(&rt->q); return res; } @@ -153,6 +151,7 @@ const AVInputFormat ff_realtext_demuxer = { .name = "realtext", .long_name = NULL_IF_CONFIG_SMALL("RealText subtitle format"), .priv_data_size = sizeof(RealTextContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = realtext_probe, .read_header = realtext_read_header, .read_packet = realtext_read_packet,