From patchwork Mon Sep 9 00:33:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1449676vqu; Sun, 8 Sep 2024 23:54:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVev8WyavfEoY4C2fzTHTc40gPTOEg3c/6GRn6OAWnVD7xN0LfQVXNPBuyIoJ+jnz/7E7ZV05ogk5ksqL1spBX+@gmail.com X-Google-Smtp-Source: AGHT+IEjpgFy0aZrF2XHjCrFIyzQA1eRz8L6eh1zMuSccs6TjjHe0TS/rnAzq3iV+isqOimIaVTu X-Received: by 2002:a05:6512:2806:b0:52f:c285:323d with SMTP id 2adb3069b0e04-536587fca25mr3139672e87.5.1725864859103; Sun, 08 Sep 2024 23:54:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725864859; cv=none; d=google.com; s=arc-20240605; b=NVaJ+2bIOq1tFMxttcbUC7OgHNjzsQnj6H12jg49EN0R/2pvJbn4GOg3XC1flEODCX ZzXHg6EOVr3pLaz4V4QcLQvXQBmvorJkhsFqYoC3URIkIZJA/XoUWTdpe0lKrCSR8erh alq4sWjoiC2XSq6hlZR1SthWtEufn7eglGLvMmOlALRSr/OQvOBbNegzrvMDhqsfATx7 FZ56vIj5dLJuVgfToCmVhF0/XpJhon3WHaCzU8V0XSkp8C30lGI23G3scuNxCxZZ138x Wv5QRNe1b2aGouFZxooL3SqnFUOBMoTd23o+vlHoMnLtK0zGgfe7VuhFl3EARLvQ3KyI tSqw== 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=qy7k17PNek1eI7v6GtRAopE0BN99Hk7XcxNznvyMmhE=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=dfOKlUbrTjSpBf0wrXzK2bBFuarR9kIcuk12YD2bkBjMBo+JYYv4lci+itgxvOCi37 5UHInIPP4traTxBgERVnmHQnY6RuiSMCLYJENOTSn9oVXrC+vneXjMH2S7UCQfP67NOo d4fFqynAJdwLKqfWSryktqpjA3GmpiyLjhYSdzEIh6OmQ525S8RxEFsjG++5W/L/sg5J h9vzvd1fw1u9yS2sls7e6cTTeisco7fBn7v1gmMW8bs36rNBab4QbR1jlcPnLjPq33oM 3xAxWA+NOENyIGheBx9U/kEjjBmms49WyjKa+0cFjPs/ZxWvfcb8/cGCUNqZqaTK79ge ILeA==; 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=TIJGkem1; 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-a8d25cf4a50si348609266b.575.2024.09.08.23.54.18; Sun, 08 Sep 2024 23:54:19 -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=TIJGkem1; 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 69C9568DE70; Mon, 9 Sep 2024 03:56:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6939768DD9D for ; Mon, 9 Sep 2024 03:55:52 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-374c1963cb6so2256971f8f.3 for ; Sun, 08 Sep 2024 17:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843351; x=1726448151; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=uHCaXS43MtwEeVZXu1lVqpKxVIwAz+UGFIJUHkGhJMk=; b=TIJGkem1vTbl8EoXwN2l7XQAjhcHCr04UrPWoA/MYghOHcofa/y+pHdOGj74anDoG2 6jgkwMwqz01AJuJZCcvW4oZs2X6BRrvouxk553pncK255zWVZ4RiuPb1jrJjc3/5jR1G fxJzwpYQBr8dlrcsC5Pai1ViasNLPgYYBqqz/ztdYCBMidXK4LfdhMNMezsypQSlsibW tzDlouS2mBXa/98NNVF9GsoeLcSP9P6fly3ECGgz3//NYxJyJfstTg67cEyAEVlhEEOa Gb4jWL1kY1Ha6YTdFlewOSafRAvmfAibEGzWdFczWY+F0QtOpaiQo4n9ZawqngEf+QRH vq/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843351; x=1726448151; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uHCaXS43MtwEeVZXu1lVqpKxVIwAz+UGFIJUHkGhJMk=; b=T5COuOMWNjyBymqGWz/lU52fRG4+Gde+TTKBNekswKhEr5nF8FfyK2OrYa/OFSr8xd xmS634JBBHdIi3ZlOj/Dd/cLIQ6NXsRnU+L4aYHVe82uPeON2CxKGJ+FAsS02bXYeOdk wDffBvOrrwRzJEXk6haSLybIPyx5ESLQNGxOalJRGbDSTp+fzS9J0ixsoK9EqxLBrn24 8XdZPFAFiMdmfgAEqyVE1RM7VJW3fmMjpcRPkUuDVD/YRqa8gfX3uUU7qpWfUt1yUR+A Ick8rer9aRo/PVF4gaQARZfMXOul9PuHn9wfEsKmG+1zKn2/eSka5dyue/M1jLXpTEIk i8dg== X-Gm-Message-State: AOJu0YzauCwN7G8zyHfdt/QmnU4kSu3+V3FuPVxWazJ+1cyTKHlqIql2 YwoCDF+ZqruPpsKXn0tYSh5Ou2KgV4ERYoygA4ITwwum5VSXpBqG4GAzuw== X-Received: by 2002:adf:f60a:0:b0:374:ba73:a90b with SMTP id ffacd0b85a97d-378895c256dmr5517217f8f.3.1725843351666; Sun, 08 Sep 2024 17:55:51 -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.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:51 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 02:33:18 +0200 Subject: [FFmpeg-devel] [PATCH 56/60] avformat/http: 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: 3BR8ZRDfhgo/ --- libavformat/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index ec60bc0b17..22e4126790 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -150,7 +150,7 @@ typedef struct HTTPContext { #define E AV_OPT_FLAG_ENCODING_PARAM #define DEFAULT_USER_AGENT "Lavf/" AV_STRINGIFY(LIBAVFORMAT_VERSION) -static const AVOption options[] = { +static const AVOption http_options[] = { { "seekable", "control seekability of connection", OFFSET(seekable), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, D }, { "chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E }, { "http_proxy", "set HTTP proxy to tunnel through", OFFSET(http_proxy), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, @@ -2048,7 +2048,7 @@ static int http_get_short_seek(URLContext *h) static const AVClass flavor ## _context_class = { \ .class_name = # flavor, \ .item_name = av_default_item_name, \ - .option = options, \ + .option = http_options, \ .version = LIBAVUTIL_VERSION_INT, \ }