[FFmpeg-cvslog] avfilter/showvolume : move width test for draw volume to the start of the loop

[Martin Vignali]

ffmpeg | branch: master | Martin Vignali <martin.vignali at gmail.com> | Sat Mar 31 15:50:53 2018 +0200| [e4cfb2c669993f01011e940de30e5da11a191b01] | committer: Paul B Mahol

avfilter/showvolume : move width test for draw volume to the start of the loop

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

 libavfilter/avf_showvolume.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavfilter/avf_showvolume.c b/libavfilter/avf_showvolume.c
index 92dfc24435..4f31cebc7b 100644
--- a/libavfilter/avf_showvolume.c
+++ b/libavfilter/avf_showvolume.c
@@ -358,18 +358,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
         return AVERROR(ENOMEM);
     av_frame_make_writable(out);
 
-    for (c = 0; c < inlink->channels && s->draw_volume; c++) {
+    for (c = 0; c < inlink->channels && s->h >= 8 && s->draw_volume; c++) {
         char buf[16];
         if (s->orientation) {
-            if (s->h >= 8) {
                 snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]);
                 drawtext(out, c * (s->h + s->b) + (s->h - 8) / 2, 2, buf, 1);
-            }
         } else {
-            if (s->h >= 8) {
+
                 snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]);
                 drawtext(out, FFMAX(0, s->w - 8 * (int)strlen(buf)), c * (s->h + s->b) + (s->h - 8) / 2, buf, 0);
-            }
         }
     }