[FFmpeg-cvslog] lavfi/libvmaf: Rename local variable "main" as "master".

Carl Eugen Hoyos git at videolan.org
Thu Nov 30 15:15:13 EET 2017


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Thu Nov 30 14:13:15 2017 +0100| [d13b8f68d7cb1e03259faf2da54ff1a5da2b54e1] | committer: Carl Eugen Hoyos

lavfi/libvmaf: Rename local variable "main" as "master".

Fixes the following warning:
libavfilter/vf_libvmaf.c:179:14: warning: 'main' is usually a function

Missed in 5d3e9357

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d13b8f68d7cb1e03259faf2da54ff1a5da2b54e1
---

 libavfilter/vf_libvmaf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
index 7670c51e21..e83b89b4f1 100644
--- a/libavfilter/vf_libvmaf.c
+++ b/libavfilter/vf_libvmaf.c
@@ -176,14 +176,14 @@ static int do_vmaf(FFFrameSync *fs)
 {
     AVFilterContext *ctx = fs->parent;
     LIBVMAFContext *s = ctx->priv;
-    AVFrame *main, *ref;
+    AVFrame *master, *ref;
     int ret;
 
-    ret = ff_framesync_dualinput_get(fs, &main, &ref);
+    ret = ff_framesync_dualinput_get(fs, &master, &ref);
     if (ret < 0)
         return ret;
     if (!ref)
-        return ff_filter_frame(ctx->outputs[0], main);
+        return ff_filter_frame(ctx->outputs[0], master);
 
     pthread_mutex_lock(&s->lock);
 
@@ -192,14 +192,14 @@ static int do_vmaf(FFFrameSync *fs)
     }
 
     av_frame_ref(s->gref, ref);
-    av_frame_ref(s->gmain, main);
+    av_frame_ref(s->gmain, master);
 
     s->frame_set = 1;
 
     pthread_cond_signal(&s->cond);
     pthread_mutex_unlock(&s->lock);
 
-    return ff_filter_frame(ctx->outputs[0], main);
+    return ff_filter_frame(ctx->outputs[0], master);
 }
 
 static av_cold int init(AVFilterContext *ctx)



More information about the ffmpeg-cvslog mailing list