From patchwork Sat Dec 30 08:40:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5b6Q56aP6ZqG?= <839789740@qq.com> X-Patchwork-Id: 45394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp5199468pzh; Sat, 30 Dec 2023 00:41:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGGX9sN5u8vyLoAkQVxh38qJHqjj5efCVnj97sO6jRGCh6esD+7Sn7wqaPAzJ5n3WjqcqWc X-Received: by 2002:a05:6512:3c98:b0:50e:76a4:f593 with SMTP id h24-20020a0565123c9800b0050e76a4f593mr10406165lfv.5.1703925664662; Sat, 30 Dec 2023 00:41:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703925664; cv=none; d=google.com; s=arc-20160816; b=KdrzWxArGvAwfftlYdSGh/1O+Yo1saPDOgx8O4VIHD/5/U1niCD5uEid0amDbTbn+2 dHs84yNSZW3qcxe58WpPBx/OAnBwyG3LvPbe4g1SxxROAXaqPFfG/Gou6jFIZopyAput dUf+D0Me0hOGpcCQIaFbLAQ4k2HiFGdhqTCYAvk3M+N+KLJKbmjd1oL1iSW9trthxL9G NZMt2M1/ffJCOH3ErG1ppy9ZnXmyWK/7cpNRVSwo73T0CJjgYmxV4Mds7zNppfPOxAkO 1TTF05vxGBHrG0lqvSQq4U2aspBtH6iybmE7yELpkSOYodD6uEOzNAC5qPvgCBWXmcRJ ZQtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:message-id :delivered-to; bh=ZdPUvZZJNVKyS2pn0KbUWTeLSBxAMupKV3B7B+rqAnQ=; fh=/QvfVIDcib8YPugs5q/sxqF0zCx8M9migilS77PcQx8=; b=mcB8gpLZfxaFGi1hZn+VjintEdFkAfKCi4/ClZoYPGrmhNRee62AD5e650g2PPcQWy KuHYnhaZ5ifBiI6t+hsjvazGNJ2BodfdiDrkdEg9lWXaGE41ObYr6ajvX/1XDFF/nxfk 3BpCFvasOolsyhAvq4judaMSUZq8/QfQ+Sn4dx0zirkc9SWgw6HVz9q7a0tGlQg3cDx0 C/YHPF3TI90KW/QPd2VWepLvsA7jiQxMdf4fzW60HVIQsUpoee9ySLrhrcpkiWJtjgAQ QKmPvUsPjD834+LwGGWOtagD1YBVTgrIIf8sG6URyTbADhaKh/8YLs0Bbn3lIFSuwWGw qa+g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mf20-20020a1709071a5400b00a26ee995fb4si4819241ejc.321.2023.12.30.00.41.04; Sat, 30 Dec 2023 00:41:04 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3603868CC2A; Sat, 30 Dec 2023 10:41:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-84.mail.qq.com (unknown [203.205.251.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B36AE68C452 for ; Sat, 30 Dec 2023 10:40:52 +0200 (EET) Received: from 192.168.8.144 ([120.231.9.184]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id A2E020C9; Sat, 30 Dec 2023 16:40:46 +0800 X-QQ-mid: xmsmtpt1703925646tdjjhs6cf Message-ID: X-QQ-XMAILINFO: NFU1LQz3zCUyhhmHOkpxog7jSv6KL0/xtee97ADu2ruNWZKf2Hb9elrGuIDz7l 5/iMAaR23U4uS5I7LR7t91H8HWWt0BLlfVlcquiP0uSYxcSG3gw09+jNr4a/paTecy31NclnFYmz IvGcgwzYTzEdb0gv8CuOgbUtf4uHThjQF+xHTyoo6CrY5iRYf1ZH6NBxyLQuhcaht8fNtChiS+S/ mZNV1A7P0+2L4etCz1thg1tb9G6n+/UB7JmZNXvvqmQb9c87ZVuZTwNL+51o8PfGG2dIaCnZcHqi K0jHJ3us6jWqDerhvuE/Fzi9A/8vFJPNEGXeMd47aGAuLom8DKK/z1ZtcBjNWlKIfWjjhc6nZdNU TRSy9ocHrmxZQIj+WhJuCO5si5uTRweT5PqZGyrgoGg1fExiBhtuz+pi2OWC929uRcG4kCnOwIzB j2SR1OcsoxgBp9lDTB5g96wrNhoEcFbKu5kCauUHCkGLRWEZYfKSveZ8FLqmreWL7xr1ZvOBRZVF e3VftkiW9V3BpYPHQYm2ocHFdXPqDYfOONGJRNk8UrNMH3Ssl9vOC9ng95yYhXWcIH15adNbxwm9 RF7dNhTb9vEOlepXEwv23cG43oO0tvAxJ6a8B36V6k9NGtrCLz3Ezs0XrJxaqCM78k6PU+PMe5nM FBYxlq32mDAtOrL2w3Otqc5X9Z5jT5UTkrudk9hsr5+ftihK4wMer3iEmDD1WV8zOlwNlbXEvtVa NxHqQiR6y0w8joFLJb68+wNHvF4OUYrqoESZS0gzsNIeTpRr28uJuoR3GXSNRXowDSF9pnMKI204 ZtRPZYzyQuyXtzeqrrpoH98VU5sCKvU62zAhN78rC6nk2QNIUoTdJwN2/ZhGdxjUW27bs3cquSa3 CfFHywnKnZ7NCeWZpNXmP1TnJumiDSH9+XP9I5P72XLusxBNGCYIupZ0k6f9dNT4FThDPZnvg13d azcV4hFb36qExC9yWwIlfVaRNrwIfuTz9mIq1SZXE= X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Dec 2023 16:40:43 +0800 X-OQ-MSGID: <20231230084043.28645-1-839789740@qq.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftool/ffplay: avoid same name in local variable 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: , X-Patchwork-Original-From: xufuji456 via ffmpeg-devel From: =?utf-8?b?5b6Q56aP6ZqG?= <839789740@qq.com> Reply-To: FFmpeg development discussions and patches Cc: xufuji456 <839789740@qq.com> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: T4dvMX+7zox9 There is a warning in XCode:"Declaration shadows a local variable" Signed-off-by: xufuji456 <839789740@qq.com> --- fftools/ffplay.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index ea5ff31393..17861e60be 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1930,11 +1930,11 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c if (sd) displaymatrix = (int32_t *)sd->data; if (!displaymatrix) { - const AVPacketSideData *sd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data, - is->video_st->codecpar->nb_coded_side_data, - AV_PKT_DATA_DISPLAYMATRIX); - if (sd) - displaymatrix = (int32_t *)sd->data; + const AVPacketSideData *psd = av_packet_side_data_get(is->video_st->codecpar->coded_side_data, + is->video_st->codecpar->nb_coded_side_data, + AV_PKT_DATA_DISPLAYMATRIX); + if (psd) + displaymatrix = (int32_t *)psd->data; } theta = get_rotation(displaymatrix);