summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_psnr.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_psnr.c
parent2386cfc1ae2982101bee6024300c0af3113c4fd8 (diff)
downloadffmpeg-streaming-5d3e935728c166344259e5a9bc1a223abb83d3f1.zip
ffmpeg-streaming-5d3e935728c166344259e5a9bc1a223abb83d3f1.tar.gz
lavfi: Rename local variables "main" as "master".
Silences several warnings: main is usually a function
Diffstat (limited to 'libavfilter/vf_psnr.c')
-rw-r--r--libavfilter/vf_psnr.c14
1 files changed, 7 insertions, 7 deletions
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)
OpenPOWER on IntegriCloud