Message ID | AS8P250MB0744BD0A6FB2AFEF38D131E48FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 0487786ffe272af2954ed4d81e827f7ad9e76895 |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp506346pzh; Thu, 7 Sep 2023 03:38:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF+dcQsSdP+B9NHZr9YmQHoyhwl160hNHHWBMLNBXGR6cFZ+cZsCtkDY+nDy8ohLnjTuU4X X-Received: by 2002:aa7:cd13:0:b0:523:4996:a4f9 with SMTP id b19-20020aa7cd13000000b005234996a4f9mr4690310edw.34.1694083101136; Thu, 07 Sep 2023 03:38:21 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z5-20020aa7c645000000b00529fa153875si10710244edr.481.2023.09.07.03.37.58; Thu, 07 Sep 2023 03:38:21 -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=eMCq+rvO; 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 54AF168C83C; Thu, 7 Sep 2023 13:37:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2063.outbound.protection.outlook.com [40.92.58.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A3BD68C82C for <ffmpeg-devel@ffmpeg.org>; Thu, 7 Sep 2023 13:37:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9i5cYIBrtL+qAz2HLt5qfg5Hze9/8s9Q5dDHzv8MMJ7j/wDKef0LZOUHDkloO75Qdned5mm4K4GCcKB2qUmUOIHjeCI+rEh1gALI50KEAitMsdjgQefUqt7BM8bkjgyHg6MgXkYHtwNeNejP5jQhkbzoxBkHmmva0VjVgzLAVQemJiaR5jMY9AvhDRW6MKz/YTWW//4LdglRNechYrhTBcZ0PszpcZfNCbP7M59rub0PFtvK/ZTfSxnkrWKjye4xkK1oUEZCCgyxhk5vcA8Tr1T2IavkBp64xeMMdbzS+KNp14kCjoDrWbcQbR925Zl3KIxUfxnRlB0iaG1ccVNyg== 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=2Dl9hylCtShpc0C4S+BtAoq0FlnFPmPfQBgWYHhXruA=; b=h6fHcrwhQ7Ro8x1REdPMRl0XAbZwSKHi/Z9jfrR6ffGsFufKF1sJMLJFIDf+zAOiIQmRk3ijhHnHeRuUCTg+pRWj3S9vo2V2XvfSdCQLFvgyHkR+U3nN7lQdBKI8vsCn19zdTpSN7rbwK0FDp0vBgNUaYO2+lJcEvK04MNMhKQVHRmaKeWAIQ0UyQi/+zwhOPt6aUquLr0iSgnXqGoFn4ctvjkrj151JthmFqqno2XZ/uCcW7KhDxD0zigHqYO4T86FNx2TfcjcZaqlf8UexFT6knD0OlbEwCTuNUAa+ZURD5W/frH9K2BKVwIZ9aqD8wFwtNzPh7LMRz3cZx+iPww== 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=2Dl9hylCtShpc0C4S+BtAoq0FlnFPmPfQBgWYHhXruA=; b=eMCq+rvO784jgyW7b5nuMJdFtVnSuz1pJsxK5d1Mhgv5Zt03HrPG/fqHCxyrpSS4fdxn5jCBBsCzW3D3lCIv7JmnMgTReReAMHH+6Uev0bd0aFc3d+1sY+ptN6dGi51N/puZ2wACFNO9RSnhqFH0Owzm09PumKRBO/x30Vaukk5zE4kAWkEIrTA/lmuCvyS5KpPitUDQnUqb13QGw2Ep9+rKBTDa3xFemerFGlz3iHMybdE51L5ZWYl+tcXAkFbfhgQPH0TBOERvYm7W7MF5b3QrTUIasi0mWF6qrWXUk8aYJ1h3pQ7pV/GI4+b6y55Lte9DIGE4VfFOD6U/3SD1Nw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0191.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 10:37:36 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 10:37:35 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 12:38:42 +0200 Message-ID: <AS8P250MB0744BD0A6FB2AFEF38D131E48FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.34.1 In-Reply-To: <AS8P250MB0744BBA654FCCAFE5649A4868FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> References: <AS8P250MB0744BBA654FCCAFE5649A4868FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-TMN: [Y68+fWLHAELL5nq9rl2ivc3ERVKG80+/] X-ClientProxiedBy: VI1PR06CA0127.eurprd06.prod.outlook.com (2603:10a6:803:a0::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907103844.673303-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0191:EE_ X-MS-Office365-Filtering-Correlation-Id: ebe8a86c-7804-4f1e-884e-08dbaf8e7342 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AJUoI4RfOhBIsTWvFEOcqa+O/VkM31ypbtqCu3iVBYqo715K0OhBtEtaJru7U0/DNibdSvbyw+5PXKUPG1/Fp6JXctMqRVNrKERvfwGgWNgt04yE2qlITfZF99Yfr+uc6BKvelFCIVUVdzcLIrKimFsbI+ruPD6yTzjR6JyGlTIBQ2dtL47KPEzeaV0UO9wM8milObbDeKyWRpgXNQxkbgpXjp253jFRzMyOjsPt7cM76VEU0guvMd49q9hvh01sOpXLPATQfxhVbjd/jRZ2lQ01Twk7+2qGBuoo+0tdwMM0TdMxJT8USqiS2UOhSU04evbUduLaOUxtFfVxHBMpCftJrr1LL/u96eEL485gziG+pnJ56OitAk5joWjLa98wI9d+XVa+/JHgbeKnbglVEFylvGmxsr3X+COjc0nCfjYB2t5bR+7ai/pRv3O7nb/2AV8ATmQ06bgrsWANZ40DsvDf1j9ac6tUv7fpgwjjk/DjtnVcoPq4XJXssnwGpaYYC4ihv0Ce34oGTjYoxmgABrF5vmiYdAOjre/Ih7dLC4cwpezr6UpCaTInNIGUAC7AOt+3KMhbgJKq261ZpBMkXKRc9DXwMFh8NZJgcLvbmw4l95u0sTPMq/OkyrAxUl5f X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JUOOaGPBFaCDbEt0CZu8NBsfSq2gX0SlKIenfWO9+q6wfvyCdtRb1zLiYHxcx0Jsz6nbOCDKPgJQk/3FhWINWZ5aar1xNQ6o9I3AwkNwVyS4x+B/us4F49UB63iDhrjmtHeoAY08u0o2uTBINCnCDzGhnp9mzVDqzYqI15q3PfD8o3ho38Yjwb9ELxMUWHLG+dp/Jt3m1q+w7WjEB2mdTAz3vbj2MxEtWj+S2Ezy5D9AoTUyoml5ev4nZ5o+o6YUNUTOnJoK54tq9OIhrMekeyqLau/fhK4Eyqz9pttTOT5NjlpFFky0C9F3l7EKB9N/q095c3Iv999GlqEnkLdX+Lj4FLw/ZlHPIMSx/r05k4XKTC/T+Bl3vI44z4jRfLMGaEMlZWUGsxRziCEUWf1vQcpXkcOgiR+6YUCL9o/0OggEyO/uHROeWyDLFqaizJ1rtDPII4aaSrdMDH4tUkAKFtlqTVB1LH5/alg5nWzKZBU0g4bsanTz751K9Ue/42fyCIwY7jprzKxqsMUlIbU5US9g3Q2If5yyHWKcQ/V/BppHc6CcKuZz1HBfLvT16zWQacmjuCaydvmKzrJR1rxEhpFg5qJoPd4b8XM0q91N8kKNs296k89OUrOnLEKgGTotEsLT+Ho7FNyrIXUZ2no0YTUOxoWZQK0Mw6ZNKGNeZd/BLcE0n9vjtP219SScfaCU/1B8mv2wxpClVby5dEicgs72B0vDi5DWAzAJ76qdFHjOXM4ovMuQApB/nFmokTiilgcBzxozIlgUkCcJ3ZmI02cga3RGVl3yWEfvloo3I0XcmoJoqRz3SwU4HoX2pjxVIKUBcxrV0Y6Kc1ir/ukSybbHJUCnWGkfpYaasraJCHNc28Tl6EMPMLEjWVX+xhxLQUX894KQ2NoKA2C4ImWm4ca0KkSJ5vKVeJcEItyNpFQlvWW7e7BoBr8ru4wlmLfaTAhldXB4hzDtpfxhLxdBdaQfCo/AOB9Q1s1eaVuIYED3RhvwInBnUzKVUMbHeu0Uk6lj8/IeZvvTztqciyyY1O7fzBEer/MZZaixgAI7yeqOA0TCx81pp4+g2d9H37wCVbakvGeMmy8wvah7jGke1EwruVOYp0hqVVF3Cg3qmQg9JxrLoXj6fzCLG8oHkLEcR02e6h9feIYZ3fKQBLk02w2sPmlARbLJWBmo5fcEzb5CWiwIdJN4Mzt3irrJtE1zgr+TnPJIAlG/PJkHJvyz2506jFqwgoDD4yZDtMUvBf3yt+/WvsfYRv6NRHajA6D5 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebe8a86c-7804-4f1e-884e-08dbaf8e7342 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 10:37:35.9434 (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: DU2P250MB0191 Subject: [FFmpeg-devel] [PATCH 24/26] avformat/avio: Remove redundant checks X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: 8fC9UD427H7u |
Series |
[FFmpeg-devel,v2,01/22] fate/demux, lavf-container: Workaround for AV1-aspect ratio issue
|
expand
|
diff --git a/libavformat/avio.c b/libavformat/avio.c index a4572d2f05..617c1c0ac0 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -125,10 +125,7 @@ static int url_alloc_for_protocol(URLContext **puc, const URLProtocol *up, while(ret >= 0 && (key= strchr(p, sep)) && p<key && (val = strchr(key+1, sep))){ *val= *key= 0; - if (strcmp(p, "start") && strcmp(p, "end")) { - ret = AVERROR_OPTION_NOT_FOUND; - } else - ret= av_opt_set(uc->priv_data, p, key+1, 0); + ret = av_opt_set(uc->priv_data, p, key+1, 0); if (ret == AVERROR_OPTION_NOT_FOUND) av_log(uc, AV_LOG_ERROR, "Key '%s' not found.\n", p); *val= *key= sep;
Checking the return value of av_opt_set() is equivalent to the current checks. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavformat/avio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)