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_lut3d.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavfilter/vf_lut3d.c') diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 39cd73f0de..c9b72249aa 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); } -- cgit v1.2.3