From patchwork Fri Sep 17 15:44:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30311 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2319073iov; Fri, 17 Sep 2021 08:45:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6KBoeA3nsqML2v8RBQwVc0n0J4FkIERgOpSdbINl2oW1iOVmRmlPRk2cSfod+KInx20SM X-Received: by 2002:a17:906:3854:: with SMTP id w20mr12448719ejc.537.1631893516427; Fri, 17 Sep 2021 08:45:16 -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 v4si7252632edi.396.2021.09.17.08.45.15; Fri, 17 Sep 2021 08:45:16 -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=ltWMZkql; 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 EFD4168AECC; Fri, 17 Sep 2021 18:45:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075098.outbound.protection.outlook.com [40.92.75.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FF6168AECC for ; Fri, 17 Sep 2021 18:45:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lxCMtf2OVtYQ49kuAkUel22/uQd2mZ1GL+bblR3A8O4mvcCU1c9EphW9CHJvLIr1FnsQfmAk1Idg1bCGEZ0y/eNRnRD+XT8lyLjC4F/EMoT4HAUJBk4YrOXvZfNfTKfsrMbWs526RlWoMlPWvyvm96GNlW1OIJTRxPokLlK5ZFXVrhHSEOhexHMPpuSqUINBB9jkwrWHXN5ZZJPB8PVj3RvX10ghVYrwqHKO37W+bz+TBhdAFlEf0tvOWZhHd68xk88gn9nu9vmcITsFK5hlDutrfYyPczyc6no/Uj8OOYi5GK/PmYOfgCEXe9RuVOrj5t5t+K761JADqAxBthn8Rg== 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; bh=CWShATv8rXO68VdMucFKPJlwGqBbh9YqZDHKSR3VHGA=; b=dTFBWmYERPp8/IpcAQ1ycqfgS+LiZ6l+S/G8AA7yNo1AsqIDcLw0/Qkbucr8c6FqqGuZ8478LtXYcd1LQsRCBNAbCKjtsCe8MCGEuZH8HLrq8SVJcIkrHjalLPBzecvdNOqYTCGv9npsCzrazGTV6ENt8x/UiUNph0Lolnrred+8YSsEFAI3k0h7hZa1rgU3A4EuiPLAeNYgO1oJdMzL1SG1btyH3jeu7u8lQJsTtKWcQTwkOx+J8Iz9d3c1/RA9XiodVGN/ajhtS3igzM4RIfNIJ1UZMvf/RbHHeCDk6QtD2tsKcAihBik7pdL0vVpbZNZ2VJeQcah68BWApg/GEg== 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=CWShATv8rXO68VdMucFKPJlwGqBbh9YqZDHKSR3VHGA=; b=ltWMZkql0LayKDnC+M266CwUI8GQB/bUxDdQdbCT2TBdT7pLmyNufLJmCLb3MfXgbehlianCSOc8rAjmjz+t58gPz5R2ACvq4jWL0PieHBNlAblIPmENME9Kne+a0MRryxWPHObwtdXv1cfD/DNZa0ILf5gxFCy5Q38nC0rm3rrPBBrCt3jYGi4LSL//Q3LZhlVxbFbARXjGBaotPkBH9B1TAauWcuryUco1M35YeKwSBlD4Ga+eP8vosIu/1EHpjT3ba6aWPe234vTmowUh80dNHVFuyy8MhP8hzOjhW6IAlBHVeEOH+VRAoVPrNiYtghLL63VpwEpH2imnCqzqDg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7453.eurprd03.prod.outlook.com (2603:10a6:102:ee::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Fri, 17 Sep 2021 15:45:04 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::f4e5:e406:78ea:7993]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::f4e5:e406:78ea:7993%5]) with mapi id 15.20.4500.018; Fri, 17 Sep 2021 15:45:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Sep 2021 17:44:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [sokUHudS3ekOHwUirF0c/xwXIrg5Y6hJ] X-ClientProxiedBy: AM0P190CA0022.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::32) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210917154456.662549-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0022.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.16 via Frontend Transport; Fri, 17 Sep 2021 15:45:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c51b59a4-ef2a-4ca9-fdd7-08d979f21df9 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3V/sJG1X9pnhKzIJ70NUePc3Qi54UKz/fmz417pgjwjPZ6n16rYGAHIHUFCVj0MAq7fsB0OMP8DgkQkx3k/rkAVxhszygYWbm5NaeO/MQgZRkoCVF4WVDDiffRcuC7hq8bgVllUbILL5m75U4NmaZdTgBLoZsg0YvNJhFc8MHv41fpoI6jKUyViDg2lVswSwsEHIldySbEVeYoi2PvEQ9hzW9+tEdlSuPZ+scf0cgoCAkai8hzg/NTaA57rDsDKi407vFkh8TQrdgnWGn/pAWlJM5lyVD9oD56xy1WOZSJhPfMpMKHZ5n6GKjG0/8Efo1eDRgfn0Ae2LetsDq4zcQSwUnrKx7eNiPRIhyjt3YKP1982uw40UXmTpsssTeQaZRkthwqjiXBfCmiNHgunfvedW8ggAX6YzVVEZIaMuRwraAOIBRvBgSoxUxBU5+NrGQGFPi6/2ndROmeAGpzkzhQmlD5MSSllpKB4EvzSPs/En6BLxgbHHCiyoJ7MvhJZ2woSFcdBbDOhI/XO31xdmAMP0WNtyCpe35Ns4l4+Wi5XlULTzbRJGponnlQ58Kv+A3FijnaDhNbrlPX8vTzVgJyhNw7DRTciY/hgEVSLNrq/uco6fItUqIBJh1dFA5ppPyvP8Pm13RGOxqQR+2BLZFNu1tjY/sDImr1WkAFxTPPc/jI7dgo8KuJ2nwThkPnYHWeIscJgGK2FVDJtC9YvJLTobh4xCQuJGxk= X-MS-TrafficTypeDiagnostic: PA4PR03MB7453: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QNmlWqbfkyHo/kqy9L2t2UaL+mTJsJikss6y8/d4A9ADckM/BJy/84c/RBUBqeyNIdWQr+Ohdx3YTiXKa+5+RCXb96gq3scCBCPPmBKFWkatLdz1NnTr8MtbionGAEoZzK8PdvXOUhUglxtb7TLY0w7NfPtwqKE3+uNA6xmyxaa9PuUtXr+09NF8HJW4iRY9RUFxTxx3kLxC0ktPmN0MNuW+tGMUrin8IAd1rz6n3XTwmnMx1H1UhUNGF9pe46rf2oPymUwaRtr3NUxRliPrbnJ+qk2uU6qDy8F3HikMZA/yerHUoLq/TWZDvtpyfS7QZyAiCg5KDW91mvvR2qnBzQ3W3+x1S1OdHFInA+eBma3uKsLM12y2CugV6pc+4t3R9UT+5gMfkqQknvlhOK8Cq4gBtWiJqXSNquIfCIrFv3/nJqOcaXUU+cJf5U+vpGRz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lffvq2aES5IGTOspnbl+lFdEDhaWZvv4V9hjsdmKw9FcoL45kPWJBvfK9Y6XrvdkHHOaA8W3OKwFT1e10l6adrMG1YWmHO7dC/DdjSs2Olz1ibjJvcdoLheggceCbuvf/JA68UEvywhA2FVAeV6kmw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c51b59a4-ef2a-4ca9-fdd7-08d979f21df9 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2021 15:45:04.4641 (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: PA4PR03MB7453 Subject: [FFmpeg-devel] [PATCH] avformat/demux: Use av_opt_set_int() where appropriate 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: H7tEkHYkkEn9 Signed-off-by: Andreas Rheinhardt --- I find it odd that the previous values are not restored, but rather overwritten with the default value of said option. libavformat/demux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 714146039f..d7393d5b46 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1733,7 +1733,7 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) goto skip_duration_calc; } - av_opt_set(ic, "skip_changes", "1", AV_OPT_SEARCH_CHILDREN); + av_opt_set_int(ic, "skip_changes", 1, AV_OPT_SEARCH_CHILDREN); /* estimate the end time (duration) */ /* XXX: may need to support wrapping */ filesize = ic->pb ? avio_size(ic->pb) : 0; @@ -1804,7 +1804,7 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) offset && ++retry <= DURATION_MAX_RETRY); - av_opt_set(ic, "skip_changes", "0", AV_OPT_SEARCH_CHILDREN); + av_opt_set_int(ic, "skip_changes", 0, AV_OPT_SEARCH_CHILDREN); /* warn about audio/video streams which duration could not be estimated */ for (unsigned i = 0; i < ic->nb_streams; i++) { @@ -2412,7 +2412,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) flush_codecs = probesize > 0; - av_opt_set(ic, "skip_clear", "1", AV_OPT_SEARCH_CHILDREN); + av_opt_set_int(ic, "skip_clear", 1, AV_OPT_SEARCH_CHILDREN); max_stream_analyze_duration = max_analyze_duration; max_subtitle_analyze_duration = max_analyze_duration; @@ -2884,7 +2884,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) if (probesize) estimate_timings(ic, old_offset); - av_opt_set(ic, "skip_clear", "0", AV_OPT_SEARCH_CHILDREN); + av_opt_set_int(ic, "skip_clear", 0, AV_OPT_SEARCH_CHILDREN); if (ret >= 0 && ic->nb_streams) /* We could not have all the codec parameters before EOF. */