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_ssim.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavfilter/vf_ssim.c') diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 40f09ad5aa..4dcdc0548b 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) -- cgit v1.2.3