Message ID | D41CE2FHVG6O.4MTEPPLH9G2F@gmail.com |
---|---|
State | Accepted |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1369559vqu; Sun, 8 Sep 2024 18:39:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXxILE44UjVfKpYN7mXUAAUIrc3zM2SD+nFYGCUhS3lKRiAmTNCcDX2fGq0Jpupts2yBTd78BHQwMDeoPu6FkDX@gmail.com X-Google-Smtp-Source: AGHT+IFuPGHMc2+f0JtEvZDdG9ZeQnQwXNHlxeztgo/P0/TfrxcLccuTIdo6a592eNszL4kVl0Y1 X-Received: by 2002:a05:6402:3202:b0:5be:fbe7:11ac with SMTP id 4fb4d7f45d1cf-5c3dc795f96mr6784831a12.20.1725845951928; Sun, 08 Sep 2024 18:39:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725845951; cv=none; d=google.com; s=arc-20240605; b=dEKMZ9HxGAqn9OJ6mH2RsilJn97nLIoPqjeI1gq2qbyFtOU+9CB28RnlMhBuRp4dHG v5EOu8YYHabhIKZgFo/n6a0qjooWVd8uCIYdcD/zSO0PIW9dXvVKuwyL2V2DrkhbZkeZ oSvYNFj5FKmdROfRHW3sthcV0NJbBa3Ojxa+91lCmCo1IRAKVMZsXuFiANTYrzVEb+Ne EFl/uhpwEP7n59+gcx7hNHVZhuTOeLSYoh5IuQuLr1MzoQvJwRJrOFKBPega+DoySsMu hl/faEq8x/tgObaDJV/+PRIEbbB0nJa7+qrY46zTbI4BCS7zbzZpdB4n1d0HfdXQqb+z 3HRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:from:to:message-id:in-reply-to :dkim-signature:delivered-to; bh=fQQF+AzWyAnNkiEsIabO4ip05q7AimMpGzomgQIZ8bo=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=K2l/bl9wOSPDVDR+snjgJbniaRHCQoI/vuxaywixkXaY+bMg3CINtAW458mV6ZVG1J i+JLvJ0yzjDmtCHl1D9dU+WL5vPVAvdKdp+F4YwGeddHRUXFHFe9QSm5lO5WuNMWEdGj r454TruL2YhpfcXxy7r2u5i1v81f0QTKHSC2OoWJkZ49UjBgJG0KlL7PfkQe2eMAP6HG 0XTyOnsjAfLB6q5DWTIo+W1A2OK0SgIkF2KKOVBWZ5AMQTseefYFLHTfyl/vgrrtSxYl BXRCUNHINJrpT+C25wycMUM8HUQ6PY36ft/O18b2CXABVBg6bBW+EiTF4g3B5gfXUWb4 H6TQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Xl14pk29; 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=gmail.com; dara=fail header.i=@gmail.com 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 4fb4d7f45d1cf-5c3ebd42ac2si2860284a12.97.2024.09.08.18.39.10; Sun, 08 Sep 2024 18:39:11 -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=@gmail.com header.s=20230601 header.b=Xl14pk29; 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=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B215068DB20; Mon, 9 Sep 2024 03:55:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07B5968DA73 for <ffmpeg-devel@ffmpeg.org>; Mon, 9 Sep 2024 03:55:07 +0300 (EEST) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-374c7e64b60so2179393f8f.2 for <ffmpeg-devel@ffmpeg.org>; Sun, 08 Sep 2024 17:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843306; x=1726448106; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=erOFddcPr0/eczV0adc0hMQqgWS2uwdPJomMm6JIFpg=; b=Xl14pk29Ch77C6SU8krtS3ci7W+1s9ApmzNbYNjwSF7cL21/iLhQJ+UQ49iv4LfQJa wtOAKhbwMQ5UBolCjdc1UGo0nNv/xqzsPtxymuvwOTekqUm8FV1ZVYI4eObuwD2FM3V7 2zb8KKoKjaDswzXhoJZ/ExMcVaFaXx+GQGsMWZYL8aNslEONiM2I1/FdDm27mob3PzLa SSkJvmUuJX49liXsS1KWEJctUk2K446fcEudn3N1CI23doZkhOpeHslPY8FM0BZAo3Ww cvrcCoYcO6u9GDquR3gDvzpwc/yP8BytkNtsIIx/qeqOQ7VVZKo+ypshaozCtALhplkn 3Yug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843306; x=1726448106; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=erOFddcPr0/eczV0adc0hMQqgWS2uwdPJomMm6JIFpg=; b=tf/kDwWHClNzLRsJIuLbrahF3QWSEhUyJD62JgYoJrOW5jQnuz58BVmT7mr86hs2AQ kkjkedYp/rtOrLcQHTbGHhQG4cG7b4T4O1hifbtJsWtaT35GyZIRaOKWRwBaW6ZluLyT Vg9tjIkCjjk9l+L//pXEZ/AHvhnJHulBNPWbWDJelVUb10KHZ8hZxyURooAW6QFD0har 2CjKPji81cUFpWidZa6o4um+HQ0YgTQLH+JOsIWmmD8s16dO9UsxisneZGPKXYsulf5r lt2fanv79onVdmz1XYhWJsGd/0WTp20UlccAgyYD3KCQBKdlzvD86/XPTVQbulvEzzuU vf3w== X-Gm-Message-State: AOJu0Yy12dezvuifX98E+4vDPHkxPL7ZlFk/3qaTtnaWwfi75LhnboZe yu1wFoR6ex2qpOea1Pp8NsZRP0EZZhcBvF+ydQdfBW+FAA2W5mSAzAyohA== X-Received: by 2002:a05:6000:b82:b0:374:c7f8:3d52 with SMTP id ffacd0b85a97d-378896c86e1mr5495517f8f.54.1725843306303; Sun, 08 Sep 2024 17:55:06 -0700 (PDT) Received: from localhost (p200300cccf1178009d94fda8472792f7.dip0.t-ipconnect.de. [2003:cc:cf11:7800:9d94:fda8:4727:92f7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649728sm4583399f8f.16.2024.09.08.17.55.05 for <ffmpeg-devel@ffmpeg.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:05 -0700 (PDT) In-Reply-To: <D41CE2FHUKJS.3JT42UG2S21VV@gmail.com> Message-Id: <D41CE2FHVG6O.4MTEPPLH9G2F@gmail.com> To: <ffmpeg-devel@ffmpeg.org> From: "Marvin Scholz" <epirat07@gmail.com> Date: Sun, 8 Sep 2024 19:58:16 +0200 Subject: [FFmpeg-devel] [PATCH 06/60] fftools/cmdutils: fix variable shadowing 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> MIME-Version: 1.0 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: 90qY3oOgpY7p |
Series |
[FFmpeg-devel,01/60] fftools/ffmpeg_opt: fix variable shadowing
|
expand
|
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Quoting Marvin Scholz (2024-09-08 19:58:16) > --- > fftools/cmdutils.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Ok
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index f725c31c12..a9a7ff4194 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -802,7 +802,7 @@ int split_commandline(OptionParseContext *octx, int argc, char *argv[], while (optindex < argc) { const char *opt = argv[optindex++], *arg; const OptionDef *po; - int ret, group_idx; + int group_idx; av_log(NULL, AV_LOG_DEBUG, "Reading option '%s' ...", opt); @@ -1366,7 +1366,7 @@ int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id, } int setup_find_stream_info_opts(AVFormatContext *s, - AVDictionary *codec_opts, + AVDictionary *local_codec_opts, AVDictionary ***dst) { int ret; @@ -1382,7 +1382,7 @@ int setup_find_stream_info_opts(AVFormatContext *s, return AVERROR(ENOMEM); for (int i = 0; i < s->nb_streams; i++) { - ret = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id, + ret = filter_codec_opts(local_codec_opts, s->streams[i]->codecpar->codec_id, s, s->streams[i], NULL, &opts[i], NULL); if (ret < 0) goto fail;