From patchwork Sat Oct 7 14:02:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5450 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp721060jah; Sat, 7 Oct 2017 07:02:39 -0700 (PDT) X-Received: by 10.28.208.2 with SMTP id h2mr3806211wmg.13.1507384959082; Sat, 07 Oct 2017 07:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507384959; cv=none; d=google.com; s=arc-20160816; b=VFd05NfDWmC4wTQtXResXH64HsuL4pQ0FoOA3UgEbvoXJldHA70aj4r6HGMMHApZ3q /O2jUJ91/Duo/Ys29X1B8Z016OUWZHYRoQh00Hfyxi6cynftCfA6Vx5HX8MXUgEIbz3P WfHZ3eV+dIO88wvYCAv/8Vd5dMJf0dVto3+75Iatplo7dVKE21j78BqR4dfFeEPKxT6w soB6cEVl8i8PBjdlWX4Lf3XSL48e+wRLycENqQ2ufYDqWPFSFPcwjQIkET+DA2Vwtvv0 AnesPNGhyvBXUNryaWJ8Y7b/4v0Jp70QYA+wV/kK3YqktidJLTKWCGxn1ezJgbLm5xW3 0Dbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=mCc6Lm+00qjE72qK45zoIN7mbaT8Oj8nNPyefcWR0/Y=; b=SwQcTvvyvB91R654Ilwo3OspahUXfCVxdmW7P6cqCoMVNdFguLcreOW7uBgcA3PuWR W5iJ/MufNWTS67AFYgJgXowGyOQmbOXgXwxd96UXZCbjIEYzPEr1ZE3sl7GYCPEGh9fC 1aq8VZh0FZOTnphHjbdQHcfsd6YP2mfLLWyqnQQh6zix8o49WEvHzuu2jlmZ6XC0AFAk L+PJpCfuYJZp1pDbRneR4K6rsymwIz6YbId/CiPnjTJcYjKnfwGbBqXLkZ0nVf+TAEgr Iwr1q0P80SSDlh/1PoK+GcTdt7ev2H4LfAuVNwmapNExB7b9q67I9YAcvJGL9lJld/Au P0Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EI3m/GJH; 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=NONE dis=NONE) header.from=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 74si3296956wrm.334.2017.10.07.07.02.38; Sat, 07 Oct 2017 07:02:39 -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=20161025 header.b=EI3m/GJH; 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=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E370B689C45; Sat, 7 Oct 2017 17:02:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f42.google.com (mail-it0-f42.google.com [209.85.214.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57409689B62 for ; Sat, 7 Oct 2017 17:02:28 +0300 (EEST) Received: by mail-it0-f42.google.com with SMTP id p138so8828468itp.2 for ; Sat, 07 Oct 2017 07:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=McA3FyiWNS4PY6xeKK1PrzmrubQKFBwFoAsEJOq732o=; b=EI3m/GJHnpo3FVcSG/XcjaM8bQWU2vUqFLZaog+pBNXGAJ2CXzK9NG4eo27BXJg2PR M7ZOtak/mOpP4aZnLqIS1Pv4yXElImbW9wDlRoJVe10XAjYo4JX9CWXDYr9J0QGHnJcN HYWhvnLeX0/E8IuCZHDuz0fcSyzO8uCDT0S4zgZ33lTyMZ8M0jZuB3fscqY0JESx1/5j i1d26cYF9QFOhcTjdcIB7q/GnQL/FpMnc59ApBhmd1bpMZYK0oMusKHJ2QgM5+wI9FVN 7+2MIy5ZNWUb2oYT+YqjHs1iVKwAX7Hj6ajEQYstpn3uGpsrRFAEqJmf78yk2d8l4/Cu 0Ipg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=McA3FyiWNS4PY6xeKK1PrzmrubQKFBwFoAsEJOq732o=; b=PztIrrdyFBLybGoS8ke/bjqwzBDMmPqFLm+h40snEv2BKofvB1Yb0cR2wTe85fjW/A eHbKL3lAcv7rK0MrAKzgIUcRDhTMxWz2YWcF6wkCKwZDgLJ8slNtS4YKxX4vNeqdoY3j kUrIn7ZTunyJgq42/+1MmJBa7CKcOy6va+TxKWnbnR7ZInBvy4s2R+Ie7pyI0dX6L0ok VWPSMQLQq1R+pK+WxPbooRGl4u8AWmg/8gdnFe5y+vIuDYvlNEgCJsr9FV7VWrf5L9Ve YKCI0js6DRBNCVq2GDyqK1T0nLT+cjhuNbTF39ge76syNjNOZqeHjtZuDScpQuRklLCV SWwg== X-Gm-Message-State: AMCzsaWMCFx53wu2M1Ws0XjiIekVaQW11kVWaTHMqBoYp7VUKl37hvC3 diOXltFhjedYWRvkwieiuutjNKpNW/O/Q5Sowkg= X-Google-Smtp-Source: AOwi7QDK+T7/UoKIXRp5YzOHP+VoD7EAGW6YkcR62aybZpbTszNlP56i4NmHuGZkhkIDOW888rZ9PmJ7urmY/LKHmAc= X-Received: by 10.36.51.5 with SMTP id k5mr6627880itk.98.1507384948379; Sat, 07 Oct 2017 07:02:28 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.134.74 with HTTP; Sat, 7 Oct 2017 07:02:07 -0700 (PDT) In-Reply-To: References: From: Carl Eugen Hoyos Date: Sat, 7 Oct 2017 16:02:07 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]configure: Add -Wno-main X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" One possibility attached. Please comment, Carl Eugen From 0876a93917c8fe06a3d9b748c39e4f643c2ecd02 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 7 Oct 2017 15:59:22 +0200 Subject: [PATCH] lavfi: Rename local variables "main" as "master". Silences several warnings: main is usually a function --- libavfilter/vf_lut3d.c | 8 ++++---- libavfilter/vf_paletteuse.c | 10 +++++----- libavfilter/vf_psnr.c | 14 +++++++------- libavfilter/vf_ssim.c | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 39cd73f..c9b7224 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -752,16 +752,16 @@ static int update_apply_clut(FFFrameSync *fs) { AVFilterContext *ctx = fs->parent; AVFilterLink *inlink = ctx->inputs[0]; - AVFrame *main, *second, *out; + AVFrame *master, *second, *out; int ret; - ret = ff_framesync_dualinput_get(fs, &main, &second); + ret = ff_framesync_dualinput_get(fs, &master, &second); if (ret < 0) return ret; if (!second) - return ff_filter_frame(ctx->outputs[0], main); + return ff_filter_frame(ctx->outputs[0], master); update_clut(ctx->priv, second); - out = apply_lut(inlink, main); + out = apply_lut(inlink, master); return ff_filter_frame(ctx->outputs[0], out); } diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index ffd37bf..79a0672 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -967,25 +967,25 @@ static int load_apply_palette(FFFrameSync *fs) AVFilterContext *ctx = fs->parent; AVFilterLink *inlink = ctx->inputs[0]; PaletteUseContext *s = ctx->priv; - AVFrame *main, *second, *out; + AVFrame *master, *second, *out; int ret; // writable for error diffusal dithering - ret = ff_framesync_dualinput_get_writable(fs, &main, &second); + ret = ff_framesync_dualinput_get_writable(fs, &master, &second); if (ret < 0) return ret; - if (!main || !second) { + if (!master || !second) { ret = AVERROR_BUG; goto error; } if (!s->palette_loaded) { load_palette(s, second); } - out = apply_palette(inlink, main); + out = apply_palette(inlink, master); return ff_filter_frame(ctx->outputs[0], out); error: - av_frame_free(&main); + av_frame_free(&master); av_frame_free(&second); return ret; } diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index adf1644..493a501 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -146,21 +146,21 @@ static int do_psnr(FFFrameSync *fs) { AVFilterContext *ctx = fs->parent; PSNRContext *s = ctx->priv; - AVFrame *main, *ref; + AVFrame *master, *ref; double comp_mse[4], mse = 0; int ret, j, c; AVDictionary **metadata; - ret = ff_framesync_dualinput_get(fs, &main, &ref); + ret = ff_framesync_dualinput_get(fs, &master, &ref); if (ret < 0) return ret; if (!ref) - return ff_filter_frame(ctx->outputs[0], main); - metadata = &main->metadata; + return ff_filter_frame(ctx->outputs[0], master); + metadata = &master->metadata; - compute_images_mse(s, (const uint8_t **)main->data, main->linesize, + compute_images_mse(s, (const uint8_t **)master->data, master->linesize, (const uint8_t **)ref->data, ref->linesize, - main->width, main->height, comp_mse); + master->width, master->height, comp_mse); for (j = 0; j < s->nb_components; j++) mse += comp_mse[j] * s->planeweight[j]; @@ -222,7 +222,7 @@ static int do_psnr(FFFrameSync *fs) fprintf(s->stats_file, "\n"); } - return ff_filter_frame(ctx->outputs[0], main); + return ff_filter_frame(ctx->outputs[0], master); } static av_cold int init(AVFilterContext *ctx) diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 40f09ad..4dcdc05 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -286,22 +286,22 @@ static int do_ssim(FFFrameSync *fs) { AVFilterContext *ctx = fs->parent; SSIMContext *s = ctx->priv; - AVFrame *main, *ref; + AVFrame *master, *ref; AVDictionary **metadata; float c[4], ssimv = 0.0; int ret, i; - ret = ff_framesync_dualinput_get(fs, &main, &ref); + ret = ff_framesync_dualinput_get(fs, &master, &ref); if (ret < 0) return ret; if (!ref) - return ff_filter_frame(ctx->outputs[0], main); - metadata = &main->metadata; + return ff_filter_frame(ctx->outputs[0], master); + metadata = &master->metadata; s->nb_frames++; for (i = 0; i < s->nb_components; i++) { - c[i] = s->ssim_plane(&s->dsp, main->data[i], main->linesize[i], + c[i] = s->ssim_plane(&s->dsp, master->data[i], master->linesize[i], ref->data[i], ref->linesize[i], s->planewidth[i], s->planeheight[i], s->temp, s->max); @@ -328,7 +328,7 @@ static int do_ssim(FFFrameSync *fs) fprintf(s->stats_file, "All:%f (%f)\n", ssimv, ssim_db(ssimv, 1.0)); } - return ff_filter_frame(ctx->outputs[0], main); + return ff_filter_frame(ctx->outputs[0], master); } static av_cold int init(AVFilterContext *ctx) -- 1.7.10.4