From patchwork Sun Sep 8 23:55:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1449671vqu; Sun, 8 Sep 2024 23:54:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFsskMdMGp4OV10dF7V2muPdtOhbstFjJkDijndxyOHCgdptwxdqXpJ1gFW01Ss8Q6EEAYF/6/OXKfqtWC3EaV@gmail.com X-Google-Smtp-Source: AGHT+IE1r02qfBQl+O9r4bDJdbGVUE72RAo4rfxnFTAcjOTQy4tq092L6UYcxdoS26OP8BzFE5T4 X-Received: by 2002:a17:906:f589:b0:a8d:141a:87cb with SMTP id a640c23a62f3a-a8d141a87f2mr742973666b.18.1725864858108; Sun, 08 Sep 2024 23:54:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725864858; cv=none; d=google.com; s=arc-20240605; b=L5ye7ViyQO9Sbl4FWH6L/IF9AF2iSrieSOl+l8G3OtGzxk78+Rm6c6FSfpm3SLpz3l CjVlyZwHRb10qVSSYa7IyOAkg0F++jBB4TJCh2wR9/4lWCoQ+Rs9lr/JqnJwxXPX44t+ 9kA+umv2xMN9a1P6EinFoZH5qW111ARwQe7HalgulQbcG6Mbe+2P4Y+9gE6TOZPYmfxt dmRdPhfYl2scAMk1OVzewgIAowr9KZvzJo6GWVcAsCvyishfmjp93u+VDpfKTge4hX8Z 9NSdAKZ/um3utyZHQkKIH5tXFQL/VBMxN1L2VdCgD773EGC5warvIqefLrZ0hvMBkXCc 1mlg== 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=sfe5N90pVJ/t0kUmgh1wUMib0zPqiH9dhamLf9qKZ3M=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=buMu+MPdwQvcl2WXUJYsjorSBAYq0psrknR4N9Xblna8fpc6XiYynW2fNObeYEU+06 Y7i41ugOAMNO1M0OVtjpWJZ6m76BUQOt4SHE6gpan8cVFp4XCxP3q9c+XLuh4/va7LZ+ HgOzq1Yq/ocdt0A2lsP6ZebzaFJ9Eswe4szixaHfDnIXWBShQ6FBHgh4AOPn1ktOULkq /bWEmKnjo0kYpBaFT5Camgt1wvf1QVx15cNytWKmHJIZSwOxojLVKVYmRNA6lqzjvApL nLo817M8S8bX6Bff2OXXiHBK3bLKtQCpqGio+6rKWqq1+PvRGM2Mwb9z7q+ID5rh1CiF 6M7g==; 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=HMrPe1l0; 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-a8d25856c22si323849666b.30.2024.09.08.23.54.17; Sun, 08 Sep 2024 23:54:18 -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=HMrPe1l0; 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 F37F168DE4D; Mon, 9 Sep 2024 03:56:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3492568DC60 for ; Mon, 9 Sep 2024 03:55:48 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-42ca6ba750eso12305835e9.0 for ; Sun, 08 Sep 2024 17:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843347; x=1726448147; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=ixAJ5mRMuz456BqjamRc0//24qp+IralyFb8syhi0L0=; b=HMrPe1l0YliJconyFKnZ3x0+heJ9/muZBOlkXP+o/UoBh+NwviurYKrcjMwtlH/fn6 sc9wwoCsCPbCslqi6lK36WLVqp8NqoY7T9CTLEv9SEIDkf1VAHQKBixjSNMVa7j/3uXN qk102iw9AVFC4Pn07CHjaw1Oc9wIB7QoU7yjt4ip1wHCmKpPKnhbsHcH0sgI3goi5zc1 nNJVZcHscIPrOaSgV6W4IxweClcS2NnADDKT4zVyRmCf/xIaxdSPTN08sf8b8dGJS+Wb IwxkUbOZfpbnufb5YCBZGn6oe28qsUC3EPMkQajKxQAAyAWXj1So2ENERKtVhus6FXIa cTYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843347; x=1726448147; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ixAJ5mRMuz456BqjamRc0//24qp+IralyFb8syhi0L0=; b=h7+Bo/1XMcScwA3TXcK9sGPBu5l8YN7x9bbQomLj0ikzoxsHDrmKRFVNVGwEvWZDEW RukQjfQ7NfXUFSN2yvEayZamPchDbfjCBBCLmkhOwo77M8BFIzbjySbGa7ReCu0yIJwi e7WVq0kXoiG3YyclsX4gKwrvTfexEFBIcvjkyyXGZ8cu/EVIAv6oyHh2iDob1gRW6qlm dSspn0TcRE8w1ELkCTW6vGeZJqL7k7gFoB1qcFHSJKQUC4DpQlLGE/SubJ1OOogJecwD 0vEgmTUL6Et4YrWW/cPViaeOtrvoJ/azA8uT/N18NLEFd6rjGWKoUnjWFUOyuvhZPpvD jHIQ== X-Gm-Message-State: AOJu0Yw/LwkW22x6FiaQ3ko3XFniZtyvY2AojNLw8mwvu8h/g8EXbyxE TO1RlhMHY2b8nb2wNvmDF/RMiySm+wOwBqx4d1jUQqDSN/5rRPhTByTjMg== X-Received: by 2002:a05:600c:1d19:b0:42c:b991:98bc with SMTP id 5b1f17b1804b1-42cb9919abbmr1159405e9.0.1725843347501; Sun, 08 Sep 2024 17:55:47 -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.46 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:47 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Mon, 9 Sep 2024 01:55:56 +0200 Subject: [FFmpeg-devel] [PATCH 51/60] avformat/mxfdec: 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: VvmNjpX8yGIv --- libavformat/mxfdec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index ac63c0d5ad..eb7d301444 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -871,16 +871,16 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size * 2011_DCPTEST_24FPS.V.mxf - two ECs, OP1a * abcdefghiv016f56415e.mxf - zero ECs, OPAtom, output by Avid AirSpeed */ if (nb_essence_containers != 1) { - MXFOP op = nb_essence_containers ? OP1a : OPAtom; + MXFOP mxfop = nb_essence_containers ? OP1a : OPAtom; /* only nag once */ if (!mxf->op) av_log(mxf->fc, AV_LOG_WARNING, "\"OPAtom\" with %"PRIu32" ECs - assuming %s\n", nb_essence_containers, - op == OP1a ? "OP1a" : "OPAtom"); + mxfop == OP1a ? "OP1a" : "OPAtom"); - mxf->op = op; + mxf->op = mxfop; } else mxf->op = OPAtom; } else { @@ -2574,7 +2574,7 @@ static int parse_mca_labels(MXFContext *mxf, MXFTrack *source_track, MXFDescript } if (language && !ambigous_language) { - int ret = set_language(mxf->fc, language, &st->metadata); + ret = set_language(mxf->fc, language, &st->metadata); if (ret < 0) return ret; } @@ -2601,10 +2601,10 @@ static int parse_mca_labels(MXFContext *mxf, MXFTrack *source_track, MXFDescript static int mxf_parse_structural_metadata(MXFContext *mxf) { MXFPackage *material_package = NULL; - int i, j, k, ret; + int k, ret; /* TODO: handle multiple material packages (OP3x) */ - for (i = 0; i < mxf->packages_count; i++) { + for (int i = 0; i < mxf->packages_count; i++) { material_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i], MaterialPackage); if (material_package) break; } @@ -2618,7 +2618,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) av_dict_set(&mxf->fc->metadata, "material_package_name", material_package->name, 0); mxf_parse_package_comments(mxf, &mxf->fc->metadata, material_package); - for (i = 0; i < material_package->tracks_count; i++) { + for (int i = 0; i < material_package->tracks_count; i++) { MXFPackage *source_package = NULL; MXFTrack *material_track = NULL; MXFTrack *source_track = NULL; @@ -2653,7 +2653,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) continue; } - for (j = 0; j < material_track->sequence->structural_components_count; j++) { + for (int j = 0; j < material_track->sequence->structural_components_count; j++) { component = mxf_resolve_strong_ref(mxf, &material_track->sequence->structural_components_refs[j], TimecodeComponent); if (!component) continue; @@ -2671,7 +2671,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) av_log(mxf->fc, AV_LOG_WARNING, "material track %d: has %d components\n", material_track->track_id, material_track->sequence->structural_components_count); - for (j = 0; j < material_track->sequence->structural_components_count; j++) { + for (int j = 0; j < material_track->sequence->structural_components_count; j++) { component = mxf_resolve_sourceclip(mxf, &material_track->sequence->structural_components_refs[j]); if (!component) continue;