From patchwork Tue Jun 15 23:32:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28340 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4312562iol; Tue, 15 Jun 2021 16:36:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmTn+cHjfSxF9libG7P/vdmhBvdalAuT3KETZi1kEj9/2Z2NM1BHcoRvR+VwNtlpw9+sQv X-Received: by 2002:a05:6402:6d1:: with SMTP id n17mr723145edy.116.1623800217302; Tue, 15 Jun 2021 16:36:57 -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 v11si307390edt.160.2021.06.15.16.36.57; Tue, 15 Jun 2021 16:36:57 -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=GORIchWz; 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 C09CF689D24; Wed, 16 Jun 2021 02:33:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2053.outbound.protection.outlook.com [40.92.91.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18F14689B62 for ; Wed, 16 Jun 2021 02:33:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ir2HE8eBB5XzzgfCvq1rqyz0wco+Msj+2FSEYPy77Z32/aGLmVEVPq0FXuxoz/x5qesX792+kC5pZMxLq6BDjjAePfQplsk8mYZutUEpNxb76DW1s0ceXcpkF45eWFBHthQhk7wLug53KyxaLB1iyexDVCSlz75YHzB5q1lJ+GI5dLSlEJD5+cWFP+N6nT1qLfgnZFfTpItvAVHNffuvpqcaBaArjaW1sUX9MaWSdnKxv3+q2SCiCurWTaajkq7O3Ww8/0TA5NJOvHzPUGZrUtlyaXVqDhAwChCT5uy5EBRIrT9rZScVHymrznv4+c+tvega6tEpU/TA1Hsgq/52CQ== 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=USTK64Ttf+Wi5+3E7zoysH+SHkSGNOEzw/R3bFC0ypU=; b=Br5h6u5JrwtSSJIgMl3z7nOU8u+Rt1zDtZLOoezEHlCa95CfonBQo8+1Hd+Vpky4O7FN0nulSm37pwOuc4SEUYEn4NPY04xQZUMzm+YY+sKh5e3yemWwFHtWJSoIK51iSgQoKLbumbKLhfurmDC2aZ+6GYs8VGySfwwBqtT1AXr6QeWUEbEF5iJMIaxyYMNwBstsjqZHfDd/WQzIZ9OHgu47SpO73fveijwR4rbHPD8UZg8V//0lyVCrXlO9gT7rh1p0zx+E83Wyr4vr7AuFmmRI0Y8aN8Jy3NbQ1dsPWIl2vYQkJJaczrHb/4MGydLLWBDgeH5XkS0ZAvIeYKlRGw== 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=USTK64Ttf+Wi5+3E7zoysH+SHkSGNOEzw/R3bFC0ypU=; b=GORIchWzoHzhOSM7Tw5RPZb4ImHU1h5E6vdVYJI2iGHJJAiYzJmkhyPK0/lIs+engf9E2jIkvxQ7ZYTuOIOyhLZrogLSHrNRWkGpxYPmMnUZbokwclnFc5Uvqmb/V9OSwovzUT5ashNzl63xxZ+YeREnQw1fRtmLDLEtz2VCaWSc3RwY3lnkFSPKDU/ijKnL5gL+2GA4AD+/SnJv8hr32ek0y2PRu6y+Ay+MW0yiwaPpgEcqW7WwlB9C9UtHlUDfhlOXh/EyqD+3iNI90qnbiDIv7p9GO+9zfWAs6l+AKUXlsh0+Hb308qQKa14ERgevoa1asDw8KQLDIjk3AVQO+Q== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::43) by DB8EUR05HT203.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::295) 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:33:46 +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:33:46 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B6CE0B434842CE24CF9B3D57423B677C76868D396B5F530DE8201E44E79563F9; UpperCasedChecksum:6DE85D838D315CECB8F3D98E4CB887D3BE847E7293B9AE0C2311FA0CC9DD6F19; SizeAsReceived:7600; Count:48 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:33:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:15 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [YdF9foSEw4DlNyWS+n2M6maVBvwNkx0H] 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-25-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:33:45 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9253fe47-7450-4b48-4bd7-08d930560511 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pYMm1Meuu1YSOko0ABnDwaDlb2CMfBnLzYVv1xYf3/S1YQoi1D81A/RSID3GBnnVin+Ednqbyl0Eni+ZWngG8Hub0Eo5JeIhWSf04Xq65CNDX5T543cNpLHgMos8MdXsrkI44+S7KpZaFd7tL+UWHTib6WaduC1RhLNObrZ1h9a8QOmSkeSdaX/ed74o0/ngbVj3FPUB+ydi7rAiICett8cIntAHKqbr4NRUNO54gLs58OkUr15QQNy1BGbz8aOG4l7dST8zrqNj0Cy0TKriYRhiZZgnPom9x92m4iyMQN1btK+ZBaxAqcz0TA5uGtk5f/iLTrAwvyadIvL0Xm8xzcLCY2BijekxS3XstHUiLSxqhf/qhl817ebdplqs3a33d/mTEZIjekXLsDha5MgzbBdnQhVTjS3AP8vfSF3wnYqyrzIgrWVYTkyoURiZttW3O+dA+BwZ3W08OUSFUH29U6tsZTVa/WAPEOXIuLy3KKfqgN5ni15UYoLXNn+LsoLSGDw2Y4CgS6Sf+CLt7KSeoA5/SHAXCAOR5uJaWOWHAb7yQxlRIFnnF6DMvF6D6rGOC5JVTDBfhDjFTYFcQynbjDq8OqQpkfn/ljXuumYF7xNm/fPiGgDtXqibp/Ws7jJKVPUBIsJBkRLWsyEvrE4Zw4n+0ov/HwShWfopSqpCDm8UBtSicSz9vWFvPmzFycCwIqvdgZ92XXvvGgawPMiE/umjLyBNV0RHBSNL7LDwlsXc= X-MS-TrafficTypeDiagnostic: DB8EUR05HT203: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +gMbPC6cG5F/j4jGskyVLOVexTIUvrCqfJopfkhpKaqjMojvJ1oADska9iEy8L/sXLGtRNBLuU9ZjJ3dXdexkEZvVf7lqvb88SGt12oehnCWMTkcQLJ0SW6UOLiNjokArHJLQL98h1jZfS4Jlqq+ZXMFcG2cj/YOLucvenARTWJppB0wKGBKYj6Zdj1QIgip/jjH1MB2REG5oxYM8Af4poMDZVfLd+vaphzW1N1cMXUjbxFYjN/uckg4i0bTKxrM4y9QBjnqAffObOvNVd7m4dWGuQmkNHlg7R+mXLs+vfT+u3UWLdHRRTgvrpxPSCHxUP9Q7CZXXtdHY5KWwKS2GaW8uvS/d0dFywACUBByS+eUb/a+kwncVcT0ZVkRUdQxNPulOrzDdcObubRQ/VPbBg== X-MS-Exchange-AntiSpam-MessageData: Uuy/504xzQ3s4upFASoI41SidAFrP7SuwmdWnG21SizJPKlM8lG0KCkJqextOgungBCmW0a2rIPQRlII9snmHGYgVXJyVSZ6LLNHeiAc5XaybTtq3dUi4BvMc6TO47PFLCVusbLN5sUizSe4Yu9MWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9253fe47-7450-4b48-4bd7-08d930560511 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:46.2325 (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: DB8EUR05HT203 Subject: [FFmpeg-devel] [PATCH 26/54] avformat/mpeg: Simplify cleanup after reading vobsub header fails 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: DUhHD4Rj7F8i by setting the FF_FMT_INIT_CLEANUP flag. Furthermore, also remove an unnecessary check for NULL before avformat_close_input(). Signed-off-by: Andreas Rheinhardt --- libavformat/mpeg.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 178e71d891..4b7493395d 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -723,8 +723,7 @@ static int vobsub_read_close(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) ff_subtitles_queue_clean(&vobsub->q[i]); - if (vobsub->sub_ctx) - avformat_close_input(&vobsub->sub_ctx); + avformat_close_input(&vobsub->sub_ctx); return 0; } @@ -768,17 +767,17 @@ static int vobsub_read_header(AVFormatContext *s) return AVERROR(ENOMEM); } - av_bprint_init(&header, 0, INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE); - if ((ret = ff_copy_whiteblacklists(vobsub->sub_ctx, s)) < 0) - goto end; + return ret; ret = avformat_open_input(&vobsub->sub_ctx, vobsub->sub_name, iformat, NULL); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Unable to open %s as MPEG subtitles\n", vobsub->sub_name); - goto end; + return ret; } + av_bprint_init(&header, 0, INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE); + while (!avio_feof(s->pb)) { char line[MAX_LINE_SIZE]; int len = ff_get_line(s->pb, line, sizeof(line)); @@ -911,8 +910,6 @@ static int vobsub_read_header(AVFormatContext *s) memcpy(par->extradata, header.str, header.len); } end: - if (ret < 0) - vobsub_read_close(s); av_bprint_finalize(&header, NULL); return ret; } @@ -1044,6 +1041,7 @@ const AVInputFormat ff_vobsub_demuxer = { .name = "vobsub", .long_name = NULL_IF_CONFIG_SMALL("VobSub subtitle format"), .priv_data_size = sizeof(VobSubDemuxContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = vobsub_probe, .read_header = vobsub_read_header, .read_packet = vobsub_read_packet,