[FFmpeg-cvslog] lavfi/af_asetnsamples: Remove the redundant condition check

Jun Zhao git at videolan.org
Tue Jun 18 18:28:57 EEST 2019


ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Sun Jun 16 00:22:05 2019 +0800| [ebcf4d354f5cd1ade20ebfe186527488990b1d7b] | committer: Jun Zhao

lavfi/af_asetnsamples: Remove the redundant condition check

Redundant condition: '!A || B' is equivalent to '!A || (A && B)' but
more clearly.

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>

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

 libavfilter/af_asetnsamples.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index a7e424f241..bbc391a4ff 100644
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -67,7 +67,7 @@ static int activate(AVFilterContext *ctx)
         return ret;
 
     if (ret > 0) {
-        if ((!s->pad || (s->pad && frame->nb_samples == s->nb_out_samples))) {
+        if (!s->pad || frame->nb_samples == s->nb_out_samples) {
             ret = ff_filter_frame(outlink, frame);
             if (ff_inlink_queued_samples(inlink) >= s->nb_out_samples)
                 ff_filter_set_ready(ctx, 100);



More information about the ffmpeg-cvslog mailing list