From patchwork Sun Sep 8 23:42:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1369572vqu; Sun, 8 Sep 2024 18:39:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX0pJFMya/2LfbZTQLSDBRRXf31RopiKqRhi0QaTyT2lHovhpGMgxzLhZLw6pAUx4CEOAygfFx6BprFMBJvkM9Z@gmail.com X-Google-Smtp-Source: AGHT+IEufZKt/izC1+iChZHjjubc/fKtOGyRNKPGYtgcYpJEDf1v+HPqG78agivl12myHTi0Vf7U X-Received: by 2002:a05:6512:3d1b:b0:536:55f2:2ad0 with SMTP id 2adb3069b0e04-53658814568mr2805915e87.9.1725845953991; Sun, 08 Sep 2024 18:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725845953; cv=none; d=google.com; s=arc-20240605; b=CsJXL7bPLhvnY0F8xNpUXCnLgF19t9w4if9cuKL4cIshnqgrdXlTVJytwiwjLA64GZ J06SQZaIqEW3KLuMFni5khLgPlonpKwcVcNyaHs+rh/EpQBlIR+FzRFXu3qnttrqPVpf qubznbYWyUC7Ri34+veo9kfcBvY3eBImU8DfxSSx4P8ALgwCTnvs70qWHQ2cpF4xj0va mo0idlSMFV/QYqwohNblU3p/VtT6YJV8VkJBEJL+DRqL6jYkjmO0GhtjWtDaAIVgknBo A9VVXxlg2c20Qu2mhMxxMAmTT/sf9Ir+YEUBYv0pJIzspiOEx/1co7Swn135UmJZT92n nHGg== 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=lOTRPvTQePPzclzeksWD931B5mDBq35fIVug29bOOFE=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=VbGnL6MI0gUSEXDCLchtXioEZUrHd9zY/73fJ3qlMZkuwZwGyNuq+jGKEsrp88kTDg 7/HXhjwAOra35vPIcIPJ+qD8Ht/xLjf+5hJ8j7MRJiSNtKQVDRVwKqULNIDZbAHpRKA8 msrvldLBJqK8LnoWxYZWe8+N0C2XPeZK/zsb7xpsUqTt46yghH9YxbWlKmJWK+/xaKLj a1rIdBtmmEVLXpiJsdr/yH9Iz2qKiIfIRmIkV3cdvotCFOdiCqtQA7niamQ7gtuukkIb P08M2zuZTPyyHHEYPpHrS/1jsmRFo1OQN50BnChoPskUODPFq98np3WPA0JiS2TnLOmZ 1AEw==; 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=Iqr7bPi7; 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: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-5365f8c13b9si1200831e87.293.2024.09.08.18.39.13; Sun, 08 Sep 2024 18:39:13 -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=Iqr7bPi7; 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 0962868DE3C; Mon, 9 Sep 2024 03:56:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4DC868DD5F for ; Mon, 9 Sep 2024 03:55:46 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42cb7a2e4d6so4100675e9.0 for ; Sun, 08 Sep 2024 17:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843346; x=1726448146; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=NtbTdyvkaYEicsTcOKV44hxg2Ts4tqLCn24krgefVFY=; b=Iqr7bPi7aIFFCTTkK3ai3rumsmFfTILPDli0Vla3P6A4XuzzFzpI/msbs8I0s90E4O zHn/F4KZTxUlP58DMiDb9MZukIwJFWzwj3gS7DHKHYD0Wp5VvatDjU1ZV4aU5CNSUQ1f r3RRBbZnMYl6ozXWIxhkun82ACL91ahC4HbySqdl1nR9hIlowygI5m9f+mPMCjUFKRDy koeBE1B/8LSZqw5v7HrkvSG0RCDJgpr3H+UAOs4XrdVcZ9v5q76XOWMMOhElkT3z0jcO NEN1Ms01+N3drNnB4NuB1xYUjW+BoR1IJYclTurukqynoy1ghkRaYHkohik1BZ38sv0D VmjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843346; x=1726448146; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=NtbTdyvkaYEicsTcOKV44hxg2Ts4tqLCn24krgefVFY=; b=XvVSUy2a5FfZNnywH2sZ37tYufHQp3AI0QRgALFXbuQIcTpDWL7G9H53su5GKgQpsw ynbw3PFhtksqde+sTcE76v3x9jEu/MsjhO3Vg5LXqvzJmLzztChjfB7ZSZsH1tKvOUVc 1LB0M6v7gezS84N/kB4hzYwfpki0/+FT1jG8t80UHZjXwX7i8AudlZEwT6Q70ulhZoLQ dxvZbUTSNtfhKWiLMwsHovHkX3TErysDfFtLkELTjaELKMqAuWRcCS36rtzuHZOjq+hL YVxDyEJCnW+D/TlsENmez1OHPgAIKC+9Gr5lEXNj2EgXaRRwYz1vQq15DOxJpXqMxwHU y5Sg== X-Gm-Message-State: AOJu0Yzw6utlN0mLhFzkRtfv24+DTAfFZz4gRtGiImFvtj2hKBV72amE te9lfcu9QgpZ8EM9FnJjoTwEjLwzyUdcRArgYu/9VemO4AL7HAwmcC58/Q== X-Received: by 2002:a05:600c:1ca0:b0:42c:b995:20d3 with SMTP id 5b1f17b1804b1-42cb9952478mr1660055e9.26.1725843345007; Sun, 08 Sep 2024 17:55:45 -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.44 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:44 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 01:42:25 +0200 Subject: [FFmpeg-devel] [PATCH 48/60] avformat/tee: fix variable shadowing 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eNQ54Jan/J3b --- libavformat/tee.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 1a2a8ead82..7ec9ab4800 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -65,7 +65,7 @@ static const char *const slave_bsfs_spec_sep = "/"; static const char *const slave_select_sep = ","; #define OFFSET(x) offsetof(TeeContext, x) -static const AVOption options[] = { +static const AVOption tee_options[] = { {"use_fifo", "Use fifo pseudo-muxer to separate actual muxers from encoder", OFFSET(use_fifo), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, {"fifo_options", "fifo pseudo-muxer options", OFFSET(fifo_options), @@ -76,7 +76,7 @@ static const AVOption options[] = { static const AVClass tee_muxer_class = { .class_name = "Tee muxer", .item_name = av_default_item_name, - .option = options, + .option = tee_options, .version = LIBAVUTIL_VERSION_INT, };