diff mbox series

[FFmpeg-devel,V2,3/7] libavfilter/vf_vif.c: fix build warning for [-Wmain]

Message ID 20210225063816.8644-3-yejun.guo@intel.com
State New
Headers show
Series [FFmpeg-devel,V2,1/7] libavdevice/v4l2.c: fix build warning for [-Wformat-truncation=] | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Guo, Yejun Feb. 25, 2021, 6:38 a.m. UTC 
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>
---
 libavfilter/vf_vif.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/vf_vif.c b/libavfilter/vf_vif.c
index 876c7c9120..0bd71eca5c 100644
--- a/libavfilter/vf_vif.c
+++ b/libavfilter/vf_vif.c
@@ -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);
 }