diff options
author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-10-07 15:59:22 +0200 |
---|---|---|
committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-10-07 20:49:48 +0200 |
commit | 5d3e935728c166344259e5a9bc1a223abb83d3f1 (patch) | |
tree | 83904ad459234f51b7e3780967ebc2e9621b6a03 /libavfilter/vf_paletteuse.c | |
parent | 2386cfc1ae2982101bee6024300c0af3113c4fd8 (diff) |
lavfi: Rename local variables "main" as "master".
Silences several warnings:
main is usually a function
Diffstat (limited to 'libavfilter/vf_paletteuse.c')
-rw-r--r-- | libavfilter/vf_paletteuse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index ffd37bf1da..79a0672891 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -967,25 +967,25 @@ static int load_apply_palette(FFFrameSync *fs) AVFilterContext *ctx = fs->parent; AVFilterLink *inlink = ctx->inputs[0]; PaletteUseContext *s = ctx->priv; - AVFrame *main, *second, *out; + AVFrame *master, *second, *out; int ret; // writable for error diffusal dithering - ret = ff_framesync_dualinput_get_writable(fs, &main, &second); + ret = ff_framesync_dualinput_get_writable(fs, &master, &second); if (ret < 0) return ret; - if (!main || !second) { + if (!master || !second) { ret = AVERROR_BUG; goto error; } if (!s->palette_loaded) { load_palette(s, second); } - out = apply_palette(inlink, main); + out = apply_palette(inlink, master); return ff_filter_frame(ctx->outputs[0], out); error: - av_frame_free(&main); + av_frame_free(&master); av_frame_free(&second); return ret; } |