Message ID | D41CE2FHWBTK.30RODDFV6AHSX@gmail.com |
---|---|
State | Accepted |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1435772vqu; Sun, 8 Sep 2024 23:04:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWZnIYWkgFN1X87fQguwClExyqFvsKhcLqIbaSZsG12Zf1EynSSKYveJxyWkPNV3Dbg1OwHguCwKxBfzvgytixG@gmail.com X-Google-Smtp-Source: AGHT+IFBN8pauk8yR/yh7pJBPQUmdVY5R7HENhx/yMIhY2eiVx3JJaQqreFPLGZhqQWIJSncJZEN X-Received: by 2002:a05:6512:e97:b0:52e:7ef1:7c6e with SMTP id 2adb3069b0e04-536587fd1a8mr7087393e87.51.1725861851712; Sun, 08 Sep 2024 23:04:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725861851; cv=none; d=google.com; s=arc-20240605; b=bkeSyfXCntvfxUdmVtFO2OZhPHNaVk3BQvosFFtpLsSdGLAPgL45GwI5dQ3F+TW9HD 39NWCtLWNG0rx4+3weXELnnchwj0788OGSCR5mgTce94sZ8dizQ42quoIEMWWNrjy+Gn Vao+GM6Sl31nw+S/ZJBGTjTEuTGCzgNulWcMup9pUIdV/KPe6L8ni38vevQMkIE3vRg5 lLPGUZy35XLZdCZJfoyXLnzOcLRpQWRmRZB0JrWghul0zEd7im1hlokNc//obkJ9fdiz phSblxjNDJPwkzFR8p34fEXLJBV1FIMyIjecgbCo09qVqOW3rPznIeb57qpBHtbgX6j5 LmxQ== 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=FSu5DvZkKeSQpqc8+eG13xGNu59Oyi3NaZXZAeo/wR4=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=TQsmsm8/pZDRgxqy9DOPCd7ifowHUg4uQ/IlToBC7pqi2FYzXQrRxeiYxRrqBEnaRk CxT903Gp0SRrqb7heI3FdnuYdxo4gC/V2UdM65p3zPT1pUdz6KzITTxOTfMzJKEF11GJ 6Gq0E4S8aAudvxuM8rnHK4EKBWZJjb3QLFEBfpVXnZG0TIjILWQE6x2CJ+xLNuvYWpyZ tnrDjlwaYJrdIny5/n4q5J4fYsGfGVlxL5EmG6JfhK53XzXwUaEtvoX2CdOcLvpuu4bW 9fhJKMbNHdgynDviMoNim437Y/1+wTnCbJjMOUn96MKArxUhzNZ7LKhcxdyNt1I6yuF6 kb8w==; 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=XE+q1HnC; 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 a640c23a62f3a-a8d25cfc2acsi339965966b.675.2024.09.08.23.04.11; Sun, 08 Sep 2024 23:04: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=XE+q1HnC; 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 CFCB668DC45; Mon, 9 Sep 2024 03:55:29 +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 AC82A68DB63 for <ffmpeg-devel@ffmpeg.org>; Mon, 9 Sep 2024 03:55:17 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-42cacabd2e0so16750585e9.3 for <ffmpeg-devel@ffmpeg.org>; Sun, 08 Sep 2024 17:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843317; x=1726448117; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=hX2KpksDKq5N13NVqU0jzyyI8iLzZItucntQRZwjbsY=; b=XE+q1HnClOw9lTJnS0gL1O3KMiCatDskqcg60uKvB4Rho/68XKlg5tMJMHNmyyQPFX SN9MetwtFB7LXlb0Cvh+ldzMIHrptJzbx02oGQoI9rfiWMKtX9H1LnEfBatsxAt3OA33 inri+wAwQHhCNN1RrpEUOe7DdBIUrgaODCHO42dnnMKMBT2AhCJQCcuwcfcjxlZtBgh4 FRrpcsxOc9LUfJMeWZXKAcujI36MqsYR53TwybNARg9VsTqzydeZmD+PPRrEpczf6DOg mdVGsA6nb5RyVK+CUng7DnKaeUIwqwLfPsjFT7T0A2r9FAoTEmd4+aG6az/ebo+QrLCi 5Opw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843317; x=1726448117; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hX2KpksDKq5N13NVqU0jzyyI8iLzZItucntQRZwjbsY=; b=v5Xa6mYpMay6zQWU1hvRhcIJJ6A7gqG4ssNvfrxqpEZmkWX1oeg6tIeWZd33GMqwNx 1CX9QMl9NS/iZurt1i/vewtfhSEE0CMX3O2P003QoIKlv3AHOHM6aPOEGp4qDlalNdOq a1xoHrvWi/XT7n2X27pZJ4psjYyFuKZZOVpd5gAKh9kA5Qs3jA3AtJr2kXWY4rwzVm8L fkquwi/yWwMVfP6i1reoZLL9oGrEcavESeZS2PP5qYGjUpDOnFGgYBHtJDFQHbul9OYq XrR1VjWgxhka6ZXb+QVJoIVvRmVFa8saYLGd/Ckqu4AD9octSWBLSRWRxSIu/lp3VfMz F4fg== X-Gm-Message-State: AOJu0YwnFIiMVdmjUFcwzf30ATDGa49W7SQWoFMTnX/8AMTuHKTzDNsm JQF/uLK3XlDMUVfHGF2vmuxzuyjUj4N1nDyhFm9JNOeeah1ErXI4oUfR/A== X-Received: by 2002:a05:600c:4fd6:b0:426:58ca:5a3 with SMTP id 5b1f17b1804b1-42c9f9e13f5mr67414025e9.30.1725843317052; Sun, 08 Sep 2024 17:55:17 -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.16 for <ffmpeg-devel@ffmpeg.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:16 -0700 (PDT) In-Reply-To: <D41CE2FHUKJS.3JT42UG2S21VV@gmail.com> Message-Id: <D41CE2FHWBTK.30RODDFV6AHSX@gmail.com> To: <ffmpeg-devel@ffmpeg.org> From: "Marvin Scholz" <epirat07@gmail.com> Date: Sun, 8 Sep 2024 21:38:12 +0200 Subject: [FFmpeg-devel] [PATCH 17/60] avformat/crypto: 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: PVXp2QgWj5xu |
Series |
[FFmpeg-devel,01/60] fftools/ffmpeg_opt: fix variable shadowing
|
expand
|
Quoting Marvin Scholz (2024-09-08 21:38:12) > --- > libavformat/crypto.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Looks ok
diff --git a/libavformat/crypto.c b/libavformat/crypto.c index cd462e7b9d..868f6ddc25 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -62,7 +62,7 @@ typedef struct CryptoContext { #define OFFSET(x) offsetof(CryptoContext, x) #define D AV_OPT_FLAG_DECODING_PARAM #define E AV_OPT_FLAG_ENCODING_PARAM -static const AVOption options[] = { +static const AVOption crypto_options[] = { {"key", "AES encryption/decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, .flags = D|E }, {"iv", "AES encryption/decryption initialization vector", OFFSET(iv), AV_OPT_TYPE_BINARY, .flags = D|E }, {"decryption_key", "AES decryption key", OFFSET(decrypt_key), AV_OPT_TYPE_BINARY, .flags = D }, @@ -75,7 +75,7 @@ static const AVOption options[] = { static const AVClass crypto_class = { .class_name = "crypto", .item_name = av_default_item_name, - .option = options, + .option = crypto_options, .version = LIBAVUTIL_VERSION_INT, };