From patchwork Sun Sep 8 20:50:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51429 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1393854vqu; Sun, 8 Sep 2024 20:14:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVR2ImtH9/g3OgGf3Ykq4P0UBI0bj7rwaGcUbqFZT3wB/JS53mlg61g0J3YGftYqATQfK8J1Js+TPoTXVn5souu@gmail.com X-Google-Smtp-Source: AGHT+IH+GhK3mzxJRfc8qzWHERdzQfSjKYEcf1manvGJB/gterafdtmf4jv0STVE/xVpDCgtTW7w X-Received: by 2002:a05:6512:1395:b0:530:db20:1f0f with SMTP id 2adb3069b0e04-536587a847bmr2680762e87.4.1725851649400; Sun, 08 Sep 2024 20:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725851649; cv=none; d=google.com; s=arc-20240605; b=TGmhq3vkEBkABSGE2PaDAHPpLPuWHVgfMsBf+YvamwFtXbszo7ZclxmREFZ5DwTQSI CoN539StQmtbEiC2wX7M9ZFKnxWBs4ITbsOqBsye5qd+yMFCuoeAy7DFqBHrZ4zcmMrd XjHOk+q/K0XG9rFBQ3u7WWCfLt6GKg5FPjWWzcXi012OP3RUK3w1Agk2YT5TZRFf9B2+ 2l/IeRiWt3SeHH5SBeDY3AZSBfdWixInYhNASrnL3w0XksGVVqAquWAarmjP0kR2vk7a 1iVToTOoc7yvIACD0CDDVvWE8qe7E8rJnCAiaF/VWRwxx2VfDzHGUI0A1MmX9+u1cCU8 BBQw== 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=+dzzX9UQab/PX1euwwebT1RFX4ZHV8Na49VBG7HOneU=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=XaqRmE5wmyV0BU+d41rxquQn/o1u1njjhkUiccRAV+Olb1fJQGlx52ABUMYGc/vfz+ 6xb4k9wKqZgzpThCvBJeYOw0F1WLBvjVPJaxyuIaoHQ5K8EvrwGT8VsiTROJO8xE7mRu YT8mx+EVF62rgIZKWMD2gqA2X1D3eKvZfkh5nbPmwktkb1DyJdbM4EjSR4xngJ3Q13Xe 2z3kyep4jkNIdPuSVaudkXS09MLTRaAh129bPXfRFG3t0+NVrlHnM6v0PmPqJS9J+gSk W/LekAd2dJVV5Dg4dcmeQ6CdTrvKER0dubaNVxTluDGKjfX8mKhVtgWtQw8J/HCiWTkA FMow==; 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=hgTPglNz; 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 2adb3069b0e04-5365f86ece3si1343137e87.147.2024.09.08.20.14.08; Sun, 08 Sep 2024 20:14:09 -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=hgTPglNz; 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 AB9D368DD19; Mon, 9 Sep 2024 03:55:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 643AC68DBFE for ; Mon, 9 Sep 2024 03:55:24 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-42ca4e0299eso15779035e9.2 for ; Sun, 08 Sep 2024 17:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843324; x=1726448124; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=qGBUsLzPMGl3XuYY9ZELLgsiTyj5fqN1QigYc3V0tRA=; b=hgTPglNz6L+7Eo0ABqyZoBUnUHXLHprf6XugWdHUPNbL/7/eYigN3DROmuLbtYhT5S jIi4I1G7jTUXz4v4X1oNT7oy+7DIrOX1RA8eO+DOHZQBxOR/0/3QVf1n6z0HBcRI/5Gb Ih/IZ64aIFMz53W5tvCh/qiq4NhHgFoZcK1cWkqqbH1U04B7Ct73OxqzQWFKQsq2M4hx +fmdjOovquAzXX4/Evf4qE6Kx5NGwSGzQuaMPD2W5gSmPgaQdIeo2rzyF1Uc58dVv7R+ IHR//Fx6dddo3adlcfxMh4BVtvhth1UAtow6StNXVxhrzqNnPHmo28Lge/dW96ITL2zI /Szw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843324; x=1726448124; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qGBUsLzPMGl3XuYY9ZELLgsiTyj5fqN1QigYc3V0tRA=; b=jd+IF9wTJmOJDfS8z1ODvk3y/phW7NYopIj6rZkT73hmv+ehXpHb3RTrspyuqJeVOw /4PBl3xc05UvuBjz+Gzbvyy+rYFEVDmw62qq6UFY59AzMNbDPp+LtaNyfIEb1kE+57CX 8aB/O1wgiTb/S6hAmUyCWMxwfvuT7QytOg0XEpCke+t8+vng9ms76t0amXmiF0wAX5mU 3K62DMnakmzPuMhdRvrashIB+Y1iwqjWiiSG+1i6i7+A1suOcqvHitbF7Z78dYPAOUtP ZSHdG213AZtTluNHukFuC/1muNTSNDCC/4CwvBlIqWztF1Yo4Rt3DyIHpAJV949P8eWo JLgg== X-Gm-Message-State: AOJu0YyK5jxH2uELoxeWRylwHKNQ7slCXJze6bslOpS/24Ukh52z0KnI QSQ3VRMLjuw7PpqDjP2L2H0qUwkJPv248yOUCpe8/zDcUFoAXHZAbV4g5w== X-Received: by 2002:a05:600c:4f16:b0:42c:a72a:e8f4 with SMTP id 5b1f17b1804b1-42cad760ee2mr46632525e9.14.1725843323696; Sun, 08 Sep 2024 17:55:23 -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.22 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:23 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Sun, 8 Sep 2024 22:50:45 +0200 Subject: [FFmpeg-devel] [PATCH 24/60] avcodec/libx264: 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: 1M99b+RwiAhn --- libavcodec/libx264.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index d07a65a103..fc0f182bf4 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -564,12 +564,12 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, mbinfo_sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_HINT); if (mbinfo_sd) { - int ret = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data); - if (ret < 0) { + int err = setup_mb_info(ctx, pic, frame, (const AVVideoHint *)mbinfo_sd->data); + if (err < 0) { /* No need to fail here, this is not fatal. We just proceed with no * mb_info and log a message */ - av_log(ctx, AV_LOG_WARNING, "setup_mb_info failed with error: %s\n", av_err2str(ret)); + av_log(ctx, AV_LOG_WARNING, "setup_mb_info failed with error: %s\n", av_err2str(err)); } }