From patchwork Wed Apr 14 21:20:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26912 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8370B44A1F9 for ; Thu, 15 Apr 2021 00:21:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59EA468A867; Thu, 15 Apr 2021 00:21:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068052.outbound.protection.outlook.com [40.92.68.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A765A68A82A for ; Thu, 15 Apr 2021 00:21:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NwBGcZ8soZGAqtpNRPHIKp8omt7c9M8QRes6EuOW/9qAq/rggnaayz8JXpkZUnXJVYAs9vtpdbjEIJ5h8VVA1Dy8xDR9iM3+94e59KT2lQ74XVXhNp41aQfAxhfEE1UKyBcjsf4UHKE3mxpfytjCSrpIbQZOiAVjrIOhc+3S3zrfOfgN3YlbC66RkjE4wvPVq1KfrwLrZWjjLpOkAr/8iaPOy6DHa1nwvbOFnUPE9RPVYr/Qh4uOupzgksib4goxGDNlAilscHlQKjQJhbEWb2Ab3gRiu1f5hcvIjz8imSSM/O+jhIadrD5ppcx5scQfUw88gxZ9CiZL60oGtuYriw== 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=CUWSZxjFt5j5c1RfUYPXx38miysauknKxBoNL55AOjY=; b=Sf0mCgHx4xVrYQOyFuQG6L9k5Xrlowb+jWgEP7PTYvOGkNxGLpIkgrdduWRqlTAgb5RO/JkLwdveI8D796sMYjvpysCl0l2ApBv3/yTuYKG/72ZJ3bqIRnC1ynUOuOml/Tps9R1PdxUsCwwvLCWry5ggMDKQDaRbI5crAq08znjXgEk80/jSVIzDkQiedv8ZSNqyG2xqdQOUQPDQo4larlc6oOm6Qcni0cJlcBMtQtSISWP6wUuToxbwdXLEMv7RIL/3UAUsQlUU75O/ysGljOe1nZyYjA2+kbvoPtNnx9j57SWI34wRSwfMka/Cq4w4t6oadZqixgGIWx6CjkoVTg== 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=CUWSZxjFt5j5c1RfUYPXx38miysauknKxBoNL55AOjY=; b=jjgDsHAXy4eBG0lwvP8lKLgcjMUNEveHnmLHn4Pt7ekPsZivaq/4HdffE2pUk6irck79pEaS6KSuxnZqZjuyV9z7G35e/EdRMAHI7lWwYzEkQdRH/ISUfKu8+EgNGgb8ZD/IxCybzbqBMMcyqiMchlvGyn1fu4bV9bD8slMFO5P1tFTW2auyg85yGxDHHdvfWHPRT1cgvlhkP6StaRhDDtsaXT+SNC7mOhKt3UOMjrlmgAKR23MF7NX5Mz/TumHbt0kqS7NjkUNw2V0a0u5dIm6EWTsEJb3HJsG9BEHxhs9VSkoeYrrRlznl2ujvvZV4dl/8ieY7EEttz42wufGiqQ== Received: from VE1EUR02FT015.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1e::4d) by VE1EUR02HT191.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1e::284) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Wed, 14 Apr 2021 21:21:06 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1e::46) by VE1EUR02FT015.mail.protection.outlook.com (2a01:111:e400:7e1e::147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Wed, 14 Apr 2021 21:21:05 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:C8B309A10D68A1825E03C6CCD0D4C807F830D117DA87FE0BAF1437F810E68F5F; UpperCasedChecksum:9B53A333219DAE0A671A4A4CD33D8A7EC9240D7A7B82586B3947133C78C6A713; SizeAsReceived:7368; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Wed, 14 Apr 2021 21:21:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Apr 2021 23:20:55 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [k7DMLuIboKKWx3omH7D2fDGGy4XmtLtG] X-ClientProxiedBy: PR3P191CA0003.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:54::8) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210414212055.1245904-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by PR3P191CA0003.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:54::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Wed, 14 Apr 2021 21:21:04 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 796b5ad0-0fae-46ca-b6e3-08d8ff8b3666 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWz9ZT4nZGZNWVvBF9S2TEb4aUOk1Nlp/1zL7NQFONdemhlmcZ0lDJVllfsOztGpwJocfYQ9PoMreEpVM0yVOrqjhesJvpW38eVKVglNOhOPCBsPIXRj84p6zwLQN4hCweERYaVIBhnd41TeEWvPgJ+vQyHryHqkbNPC5FWJuW4DYmFSLBXGesDTKLZaGrGaBpRV+vgccYnQ/ziPK4er2o1iESK+8nwy3bxG4rNzzkOaCXDyhano/LrYiXHZ0PfAsjrdbtzzZm1Gi8FcYswnV1C9xVQae0rJOPC6IF0JnyPgjuAVZWN035fWF5dmCw6OO/qsMS/dY+y1JuYinSQhoVY7zhPl5GDGzQVMkm3xYpm6GOh5OPIGDq7mYgBi4qllSWm/RToDT+wBp/W2RWVVg171eY37Bq2bG9IPXoggh4bgiCI90K1c5JQmYnxNdkDtOz13EHYd240EqgX4ytm6sNFWRZ4VZYyKl7wzkrZtDOOUS1U3tfh/U5MBZgezcYY9uBnoQr9ycEBq0aWRCR+Ub9Om83zPY8c8xG2aVnlxRidREf+xBsDEwmXfpE/74lzLkf1N/O1lnns6p6j0+PBhuCQQ4E5ntj+5Ij+W51n5MoxD+5wThOwIq5EWqGjq6TIqtm8o+IHR+6Os52vYIdHYx5INJbymI6DvssJBTcqeIgUscVZgiffGpkoL+nSpAcUlKp31ccm0aMY8QbhUoTg5rjn23wKjQsCLBM= X-MS-TrafficTypeDiagnostic: VE1EUR02HT191: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g2+j+mGYa1XWR9ULrJEDHsoBIBUZ6QtMxTmh+oOOJ8MypEtWqmjcvQ6Avpctbj7NLCdSMjqTO9rLIzbtiZhTODbYytPWGLcY2nEArlPDMxAmdUsAMKVLaK8FN9PJ6bQcGWvsLCHjdsuH1zd5XV8TOwM8hOVeFY0OHqhWeiRj9OHMPVGx5RR4OTuitppvy1qFwPrhU4wLi8wu8+y4WRU5JrtGkUY9hUTGeVczrfc1SCNn3r2t2GqBB0afxlWzwLevhtjuDKl4Uotzaq1fhb1YpFZQ0fbIpjCI/zSD9h2p6DS4YctcBws+B00jVoA0Ule3ywWsqepNSPxwwAb88QqlpnrRXcnfq/WsgfLUROMmpdmULaqpBF8/KYPK4YM6UpUzmzyBFTs4OR3jluDwF7bccA== X-MS-Exchange-AntiSpam-MessageData: kRVwBJ5BTQdJBh0sSwlbkkKZ4qz7MMzEN9cw3vMS3z4MBShggU6+dmR7mNhMxpIc9OmAmO0uEsYxnQWsAKqyk6AnzNhtnrvT/erNC4B2nxEG2e+Nz/rTgUqIjAjlBzy7uK64I5C43e6I83w23RkabA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 796b5ad0-0fae-46ca-b6e3-08d8ff8b3666 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2021 21:21:05.4751 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR02FT015.eop-EUR02.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: VE1EUR02HT191 Subject: [FFmpeg-devel] [PATCH] avformat/utils: Combine identical statements X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" This would only make a difference in case the first attempt to initialize the encoder failed and the second succeeded. The only reason I can think of for this to happen is that the options (in particular the codec whitelist) are not used for the second try and that obviously implies that we should not even try a second time to open the decoder. Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d9971d7fd3..d4ec3d0190 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3747,16 +3747,10 @@ FF_ENABLE_DEPRECATION_WARNINGS if (ic->codec_whitelist) av_dict_set(options ? &options[i] : &thread_opt, "codec_whitelist", ic->codec_whitelist, 0); - /* Ensure that subtitle_header is properly set. */ - if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE - && codec && !avctx->codec) { - if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) - av_log(ic, AV_LOG_WARNING, - "Failed to open codec in %s\n",__FUNCTION__); - } - // Try to just open decoders, in case this is enough to get parameters. - if (!has_codec_parameters(st, NULL) && st->internal->request_probe <= 0) { + // Also ensure that subtitle_header is properly set. + if (!has_codec_parameters(st, NULL) && st->internal->request_probe <= 0 || + st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (codec && !avctx->codec) if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0) av_log(ic, AV_LOG_WARNING,