From patchwork Mon Sep 9 00:40:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1381326vqu; Sun, 8 Sep 2024 19:24:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVCPIyFnb9g6KnVp/aqVsYnicd9sABj6I+4w5ksH1ITwKiRh5hx3QlxwFztF64vfa53wOQyzAy4bwR/+8vBCRta@gmail.com X-Google-Smtp-Source: AGHT+IHUKratTQ8A4uXOQIQ/MnkjV0SzY+dVgKy2GdLPkkOEnypSP8OOdDWp2BVWuTqt3uthH8E2 X-Received: by 2002:a05:6512:b26:b0:533:40dc:823e with SMTP id 2adb3069b0e04-5365880a732mr5919966e87.48.1725848652077; Sun, 08 Sep 2024 19:24:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725848652; cv=none; d=google.com; s=arc-20240605; b=MxJdlaXNHWMBzX5VTdfgjqNQhZgyejTro9l+Z+IYlMosW6jfJ66pehZB3XngVy1RDp 9V3UGu47vbwfcSVo0euCVA2WOPmHZgz8drKmI4JSvIMHWLgR24cYUVj3fZy623mHaI/u dL+6iTzjLsujcF/rs0wdYf5mZYmiMFu/7A8OgUNczowRG0U4bQEvvwJzJ1u/MfwtCvS1 B4S8VT8LVaBQL45yYArsjUMP2dgLQdw5Fj2tlMhf1CVY6HrKPpps7iY6IVE5xcw0FyJ0 iE98A9ByDsW5Z7vZO9KQnLqF72hK4xIGwSqgN1p8VkIrOjM1EH8NYPIJm4f26yMud+Tp Vhfg== 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=e4wZSrQiNYsxqp2LLMISBFliKrlwIsdcrYPM7ugP/zI=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=JOw1QkW0bb9OKcCpV2vnrAuKte5fpJebPCHJPkN1IySBUDFopFMi6xTr/2I96m+otv SGj3RFduzleSjX5UpT0m6sHNVMBGgv4tfmqdDL6gi791DOv96/1UsISwtUhpWz6Flr70 iG34kWLk9d1k0QJTAI6oa6RXpPYQWdDAjzVVRFu8qF1zH2kMbm6Iq9fmRwiOLoitX0Ig y35n2ioqUkX2uSj7S49w9y+A+eRzFlBt6mQOFTZIKrWOyICNeAB2b78APBwsd6Mbho3d 11Q/UHqQDyMJ2KP7tOVYzMjSdZPVOsJwNSlDH/MRoFp2IthvVW/n8mOjYE1/ZLExP1ZB Lyxg==; 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=Z2gP5RtP; 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 a640c23a62f3a-a8d25c60ebcsi297152766b.309.2024.09.08.19.24.11; Sun, 08 Sep 2024 19:24:12 -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=Z2gP5RtP; 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 8D17468DE7F; Mon, 9 Sep 2024 03:56:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23EB168DDA5 for ; Mon, 9 Sep 2024 03:55:54 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-374c1120a32so2167848f8f.1 for ; Sun, 08 Sep 2024 17:55:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843353; x=1726448153; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=HwaJzJ1qO2MqaDyOguD9FrAsKZnzIEmo6jGZ3Cjvup8=; b=Z2gP5RtPkk9BAdQqfqWx3en9E5Ai/CUZf5EAM5pG1Xa8zMCcY7NcWfMFD23FK71pTk Jrv1icxLpPw4Lvti3B6ykksrRL3TWtk9gHNRV8PRkMr+neSymssadz7kVTf52SCjWz1z wX5/wjzZxL+rVNlAs5RpNudqFY5Z4kZjEjJ1+d3vWwXezEHpmtxWaKSufuQSMvxzaCNr waW+WJKv9+HyI3smG8RL8gns5bWiISATAiTCPuCHBGXA+ycAqqWEkf2vlNv9CKXNPvge 0uhVqoA5LuYlNVqUPDDsd5yRSpuFSSAL9inhoodxrlt5YbeCWikwKIaXYUzfC4CDuFA9 J0vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843353; x=1726448153; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HwaJzJ1qO2MqaDyOguD9FrAsKZnzIEmo6jGZ3Cjvup8=; b=dgCTSvuDDaN2Qfy/RXrEUwPLQKtdn37HACJLg7eQA1rRe1IpW5jvo3Jx+tL6LvnWck yzy/CUk/x/tqXQcz0JyYh7feTORciJeNyPCd4Jaa0Rdfyx1HUpiG2yjnuf9277nXZL6w aE5G14bGj6sCZdH6fkpvRUhhgRO0c21QlKUdN+pVfIfCksxoACSv/EOmDAi5DSuNsI4u DUla8kCIG9M2J4iIadyqFNHJYzK5EvB/RDUgQ2ZTm9u9bZv+S+tbb97aB3tB0zfCFndV YM39OJ0dezllScdY69NMaT2tWVccfWEQFFnuC15/HFWgmS3P5Sz1RsdjIHkVCXcNNu33 0GEA== X-Gm-Message-State: AOJu0Yzfx/Yx0ckXK9DQE/gLaoixF6pOAnMKplObmiLQ87Ft2GaI4Kkd 7/xI1pqX+/uQWxE8+95i+KhISL8OYl67vXPDM6eDA0bz3qPq1odbQ/XDrw== X-Received: by 2002:a5d:40d0:0:b0:374:b97b:c69 with SMTP id ffacd0b85a97d-378896a4166mr5818035f8f.48.1725843353383; Sun, 08 Sep 2024 17:55:53 -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.52 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:53 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 02:40:15 +0200 Subject: [FFmpeg-devel] [PATCH 58/60] avformat/avio: 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: tJ2CyoLQBpS3 --- libavformat/avio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index d109f3adff..fd767c9ba9 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -57,7 +57,7 @@ static void *urlcontext_child_next(void *obj, void *prev) #define OFFSET(x) offsetof(URLContext,x) #define E AV_OPT_FLAG_ENCODING_PARAM #define D AV_OPT_FLAG_DECODING_PARAM -static const AVOption options[] = { +static const AVOption url_context_options[] = { {"protocol_whitelist", "List of protocols that are allowed to be used", OFFSET(protocol_whitelist), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, {"protocol_blacklist", "List of protocols that are not allowed to be used", OFFSET(protocol_blacklist), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, {"rw_timeout", "Timeout for IO operations (in microseconds)", offsetof(URLContext, rw_timeout), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_DECODING_PARAM }, @@ -67,7 +67,7 @@ static const AVOption options[] = { static const AVClass url_context_class = { .class_name = "URLContext", .item_name = urlcontext_to_name, - .option = options, + .option = url_context_options, .version = LIBAVUTIL_VERSION_INT, .child_next = urlcontext_child_next, .child_class_iterate = ff_urlcontext_child_class_iterate,