Message ID | D41CE2FHZ09S.3HQDBF6E3CDP0@gmail.com |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1368456vqu; Sun, 8 Sep 2024 18:34:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWulh93x1sHrMPHtPeZJg5aOkOJ3VHXWlXLNbY9Nuuc3A0snt/Qn54z5h6x0FINumRWzH0hgzNispSgc3zUKd2n@gmail.com X-Google-Smtp-Source: AGHT+IE0W69hUlRNGpiLdv4FyyE+1xLu9VuH1dPpkz+xl1pEvOVkfBUbBteOOtBfiGiSMAwOgEbK X-Received: by 2002:a5d:5d82:0:b0:378:90fe:f753 with SMTP id ffacd0b85a97d-37890fef859mr3203384f8f.28.1725845688198; Sun, 08 Sep 2024 18:34:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725845688; cv=none; d=google.com; s=arc-20240605; b=Dt9JN8EQQ1DCQLLuNsY9y0X0Uk3G4omvA483bFND+PWd8tbZiNbGxCBg7TCuNBIXi6 TrAqF27IAE3rHB3RDyE8JV9q7ymRpgGBksuMhu1YIUiAdZdTKh13zhbJUJaboiGogkQD Bwo7ToPSOlpVy0Mj4i2QZHTz/lTB7aD2eusRCXMSW5LArpXeUX+qxc2aVf4J1EteOW6U x/TwRZe3tf8IfgJZzTM/WLR4Yu9OgaD/FDaugAL+CNR1Ikr1XPTiIpixi+/b9TdLRjtz DiKJBW9OSy46x8ugOHfMaasTRGTmdTiwOYVFlq8tqqH1iIx/d+xWGVdgtVZvmqw9omd/ Qvzw== 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=IO2lkKIOjjmG3TCBQM8mEOHv4TH0DpUhLNCHhE0UwLw=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=gzqJQSRp5D3oy5OmE1PeTlZg2Movajb5bNcxhTM4Wj9UlLXnzpxhD3YBda1zOWU6MH x+ExROdNcst8wict4cEmL41VFlDVCr10xwgXcgY1rvfn7fUsDVzLMFsc5h9Lrz162+/6 YicPX+/Ck07lYgSkc4QZX7Cru1trjVPg0XymSB+7wGTu2nkLTrkwBkkNriXJA1l0vSOz y1UWrsTxYz1Es7kAT5xXNoCpANcg1SmatNRqdVDq2gM5EwDoHcn5RjSXYFNASAhlh0Os X3GzzdJdl1ktcYoGMyKRqMGQxcQdvCYXPfvXtxQdAJLhNwQAi/GL7pdWBPTMOW+csMXS G2qg==; 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=AYnYQEci; 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-5c3ebd9f69dsi2831465a12.468.2024.09.08.18.34.47; Sun, 08 Sep 2024 18:34:48 -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=AYnYQEci; 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 D60C168DE31; Mon, 9 Sep 2024 03:56:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C8EA68DD55 for <ffmpeg-devel@ffmpeg.org>; Mon, 9 Sep 2024 03:55:46 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-42cb8dac900so2282215e9.3 for <ffmpeg-devel@ffmpeg.org>; 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=eU3i9pmrnpVIUq46oZfQzSZy6XOFBiMWe7Q5Y6U/rlw=; b=AYnYQEci2F4jX+upmpwohUwJIYWn1nNM6aPajRxCl5YuzWd1LZ2Uvq0zFvdiOabWAT U/zHaXPO6dtou2kTLApOos3Uhbia8jgLyu+sD9hxP9xNmhC7WGBQSEGV1U1KXe9GGbwm WK50fo972vw7F817mT6/bgnkeovwBKwbHNyuVd5iOCktM804PAv7iLCjY52EaAQ9MaqU 163jLCXpmqgIstOX0MpCdiv16+g8XPweydUCwnodJzQJ+sbZUHaZ782JVk/glW93vUut Pr0LfMuXbkqbjivODj6CV0zktV0qoSPBQAdnsjs6SRd9uYs2IW5smg8i5ntR8BW6DxrY IEFA== 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=eU3i9pmrnpVIUq46oZfQzSZy6XOFBiMWe7Q5Y6U/rlw=; b=rfUZ+T9v+HeGiiOd5xpiCKWGIJ4diViBF0m8W/FIe2o8+6na3NMwj1qQyHAynRMvO/ 8NRb20YBCjgQOv8rSBT81QnbSCFqo0wYAbnWcYhh+CBx+ONbu2W4PLRiRpDUkTa4L6Du +687WPcaj4YNqmGcx4DRIer4qtO3ett5S303eDWlR86/sV+XSHn9XvPcc2EagzM42Nv1 BhVxxO0H71aPgewP5knOW32j0v0AD8ROyrF5AosZk0Wq3X185SXZ8vGGAo39AsCKjUDc OeYuzilWvBTGO6QtomS4JlVL0XNahYoI8Sz9o41jdff+BydfChqAagpZiEK5ixlNuP50 FopA== X-Gm-Message-State: AOJu0YwSQUUF1JpN6zETavrPcmbCHjmU+OABdw0zR/j/KyKVRbLeQB5I WDcd7ztKS0wOfbv6GCou+nOcXMmPU3j9jmiWOZ6pbdahO61PCoEHzaBWbA== X-Received: by 2002:a05:600c:1c99:b0:42c:b4a2:a1aa with SMTP id 5b1f17b1804b1-42cb4a2a3a4mr18845845e9.17.1725843345923; 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.45 for <ffmpeg-devel@ffmpeg.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:45 -0700 (PDT) In-Reply-To: <D41CE2FHUKJS.3JT42UG2S21VV@gmail.com> Message-Id: <D41CE2FHZ09S.3HQDBF6E3CDP0@gmail.com> To: <ffmpeg-devel@ffmpeg.org> From: "Marvin Scholz" <epirat07@gmail.com> Date: Mon, 9 Sep 2024 01:43:23 +0200 Subject: [FFmpeg-devel] [PATCH 49/60] avformat/srtpproto: 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: BWDWuJqH3ePK |
Series |
[FFmpeg-devel,01/60] fftools/ffmpeg_opt: fix variable shadowing
|
expand
|
diff --git a/libavformat/srtpproto.c b/libavformat/srtpproto.c index 02cf156327..cf6064625c 100644 --- a/libavformat/srtpproto.c +++ b/libavformat/srtpproto.c @@ -37,7 +37,7 @@ typedef struct SRTPProtoContext { #define D AV_OPT_FLAG_DECODING_PARAM #define E AV_OPT_FLAG_ENCODING_PARAM -static const AVOption options[] = { +static const AVOption srtp_options[] = { { "srtp_out_suite", "", offsetof(SRTPProtoContext, out_suite), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, { "srtp_out_params", "", offsetof(SRTPProtoContext, out_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, { "srtp_in_suite", "", offsetof(SRTPProtoContext, in_suite), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, @@ -48,7 +48,7 @@ static const AVOption options[] = { static const AVClass srtp_context_class = { .class_name = "srtp", .item_name = av_default_item_name, - .option = options, + .option = srtp_options, .version = LIBAVUTIL_VERSION_INT, };