virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avfilter/vf_vif.c: fix build warning for [-Wmain]

Browse Source 
src/libavfilter/vf_vif.c: In function ‘process_frame’:
src/libavfilter/vf_vif.c:542:20: warning: ‘main’ is usually a function [-Wmain]
     AVFrame *out, *main = NULL, *ref = NULL;
                    ^~~~

Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
This commit is contained in:
Guo, Yejun 2021-02-25 14:38:12 +08:00 committed by Paul B Mahol
parent ac6dd87cd1
commit ae4f6379d6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vf_vif.c
View File

@ -539,22 +539,22 @@ static int process_frame(FFFrameSync *fs)
AVFilterContext *ctx = fs->parent;
VIFContext *s = fs->opaque;
AVFilterLink *outlink = ctx->outputs[0];
AVFrame *out, *main = NULL, *ref = NULL;
AVFrame *out_frame, *main_frame = NULL, *ref_frame = NULL;
int ret;
ret = ff_framesync_dualinput_get(fs, &main, &ref);
ret = ff_framesync_dualinput_get(fs, &main_frame, &ref_frame);
if (ret < 0)
return ret;
if (ctx->is_disabled || !ref) {
out = main;
if (ctx->is_disabled || !ref_frame) {
out_frame = main_frame;
} else {
out = do_vif(ctx, main, ref);
out_frame = do_vif(ctx, main_frame, ref_frame);
}
out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base);
out_frame->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base);
return ff_filter_frame(outlink, out);
return ff_filter_frame(outlink, out_frame);
}