From eaff7ac863037e0126266acf173f2dac45e54bea Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Sat, 31 Mar 2018 15:50:53 +0200 Subject: [PATCH 2/5] avfilter/showvolume : move width test for draw volume to the start of the loop --- 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); - } } } -- 2.14.3 (Apple Git-98)