Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-10-07 16:59:22 +0300
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2017-10-07 21:49:48 +0300
commit5d3e935728c166344259e5a9bc1a223abb83d3f1 (patch)
tree83904ad459234f51b7e3780967ebc2e9621b6a03 /libavfilter/vf_lut3d.c
parent2386cfc1ae2982101bee6024300c0af3113c4fd8 (diff)
lavfi: Rename local variables "main" as "master".
Silences several warnings: main is usually a function
Diffstat (limited to 'libavfilter/vf_lut3d.c')
-rw-r--r--libavfilter/vf_lut3d.c8
1 files changed, 4 insertions, 4 deletions
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);
}