summaryrefslogtreecommitdiff
path: root/libavfilter/vf_ssim.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-10-07 15:59:22 +0200
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-10-07 20:49:48 +0200
commit5d3e935728c166344259e5a9bc1a223abb83d3f1 (patch)
tree83904ad459234f51b7e3780967ebc2e9621b6a03 /libavfilter/vf_ssim.c
parent2386cfc1ae2982101bee6024300c0af3113c4fd8 (diff)
downloadffmpeg-5d3e935728c166344259e5a9bc1a223abb83d3f1.tar.gz
lavfi: Rename local variables "main" as "master".
Silences several warnings: main is usually a function
Diffstat (limited to 'libavfilter/vf_ssim.c')
-rw-r--r--libavfilter/vf_ssim.c12
1 files changed, 6 insertions, 6 deletions
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)