From patchwork Tue Oct 18 12:36:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2083200pzb; Tue, 18 Oct 2022 05:39:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ExPg7K6CWoscg7EetR1NQTtsIIHDdLGrugiaDStleGptB+dDKKmlQmI+oI46vg7TVZZbg X-Received: by 2002:a17:906:5daa:b0:78d:fa76:f837 with SMTP id n10-20020a1709065daa00b0078dfa76f837mr2146829ejv.239.1666096785493; Tue, 18 Oct 2022 05:39:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666096785; cv=none; d=google.com; s=arc-20160816; b=CXUrOlkH8jcEx+PHRdtAcPfehEzAW8YRWqdd+DpgbrqBMhalj9kTtMA8XbLy+e4dnW Z8kwgFaO2nyO02+kCkVXvrV2ZIfZ7J5TLXgCQXR0VaZ8FHw5UX9InttwCGX8eCutwxcM ffrg6lNBvPG+u3P5P9DhagrMcGLe+ULp1ZaUTduN1rf3yIv9kiGcQE1nrVn+NkHjn/OA IB0XU4mkswCQ42tfdKf7A6l4yzbS73X79+HMjUWgtnyTvjVnnbnZnF66eAxo2M+/vNDh 82ElDuAj8m6q44Zb2TXWmMRau8lagsclwQSugBixW/pEaRQY/mJCUfywXnh4EnjaXUAg i1Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=suv93u20Pbb3cKBgV8aBFBDVOb18ujmQCvV0vXYi2AM=; b=tMHDtFTQeQjGN/bCXoUfN3rTPvBNlLvDij5mLTQmJpOTvxSc3vJpFK/A4+OFLarB7m 2jYdPE37su8nL9EFhFvUjxFx18QiVpcsHIyfTIuuA2HKHHSPMYW/qSx+xtuSweZjZCTS s2Orhg2ffH3gLpyw/fEUbo9+xDC8yUJDaYwpF6HcYEi5be/rQGz79KWjbdwxYI0xnWRz XKjaA0PP6Nq75YwFGI1TK3wIXM4dGEIpz9UGBhq9hBW5vwpBrvaJLIiawvHHf18vZwqq WCVqPCAEZLO+bPlE0cLNKODKIyXjq5kjr6AUekq8xIQrtF/Z1fmTWp5L5CwV1Ksvw/Dv 3MCg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf38-20020a1709077f2600b00787f13c332esi11907872ejc.799.2022.10.18.05.39.44; Tue, 18 Oct 2022 05:39:45 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDF3268BD21; Tue, 18 Oct 2022 15:38:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2155168BD1F for ; Tue, 18 Oct 2022 15:38:21 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 99F712406CE for ; Tue, 18 Oct 2022 14:38:19 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id tKjFI4xrmiPP for ; Tue, 18 Oct 2022 14:38:19 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id D3F732406CF for ; Tue, 18 Oct 2022 14:38:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C53E23A1909 for ; Tue, 18 Oct 2022 14:38:13 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 14:36:53 +0200 Message-Id: <20221018123701.25002-12-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018123701.25002-1-anton@khirnov.net> References: <20221018123701.25002-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/20] fftools/ffmpeg_mux_init: avoid modifying OptionsContext.chapters_input_file 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8hNVoA4w+5od Use a local variable instead. This will allow making OptionsContext const in future commits. --- fftools/ffmpeg_mux_init.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index cd46f441cf..f608376cf0 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1537,6 +1537,7 @@ static void copy_meta(Muxer *mux, OptionsContext *o) { OutputFile *of = &mux->of; AVFormatContext *oc = mux->fc; + int chapters_input_file = o->chapters_input_file; /* copy metadata */ for (int i = 0; i < o->nb_metadata_map; i++) { @@ -1553,23 +1554,23 @@ static void copy_meta(Muxer *mux, OptionsContext *o) } /* copy chapters */ - if (o->chapters_input_file >= nb_input_files) { - if (o->chapters_input_file == INT_MAX) { + if (chapters_input_file >= nb_input_files) { + if (chapters_input_file == INT_MAX) { /* copy chapters from the first input file that has them*/ - o->chapters_input_file = -1; + chapters_input_file = -1; for (int i = 0; i < nb_input_files; i++) if (input_files[i]->ctx->nb_chapters) { - o->chapters_input_file = i; + chapters_input_file = i; break; } } else { av_log(NULL, AV_LOG_FATAL, "Invalid input file index %d in chapter mapping.\n", - o->chapters_input_file); + chapters_input_file); exit_program(1); } } - if (o->chapters_input_file >= 0) - copy_chapters(input_files[o->chapters_input_file], of, oc, + if (chapters_input_file >= 0) + copy_chapters(input_files[chapters_input_file], of, oc, !o->metadata_chapters_manual); /* copy global metadata by default */