From 5d3e935728c166344259e5a9bc1a223abb83d3f1 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 7 Oct 2017 15:59:22 +0200 Subject: lavfi: Rename local variables "main" as "master". Silences several warnings: main is usually a function --- libavfilter/vf_psnr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libavfilter/vf_psnr.c') 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) -- cgit v1.1