diff mbox

[FFmpeg-devel,V1,3/3] lavfi/af_asetnsamples: Remove the redundant condition check

Message ID 1560618818-14485-3-git-send-email-mypopydev@gmail.com
State Accepted
Commit ebcf4d354f5cd1ade20ebfe186527488990b1d7b
Headers show

Commit Message

Jun Zhao June 15, 2019, 5:13 p.m. UTC 
From: Jun Zhao <barryjzhao@tencent.com>

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

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 libavfilter/af_asetnsamples.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Michael Niedermayer June 16, 2019, 7:32 a.m. UTC | #1 
On Sun, Jun 16, 2019 at 01:13:38AM +0800, Jun Zhao wrote:
> From: Jun Zhao <barryjzhao@tencent.com>
> 
> Redundant condition: '!A || B' is equivalent to '!A || (A && B)' but
> more clearly.
> 
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> ---
>  libavfilter/af_asetnsamples.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
> index a7e424f..bbc391a 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);

LGTM

thx

[...]
diff mbox

Patch

diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index a7e424f..bbc391a 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);