diff mbox

[FFmpeg-devel,4/6] lavc/libvpxenc: remove redundant condition check

Message ID 1557504354-27086-4-git-send-email-mypopydev@gmail.com
State Accepted
Commit f82a02aa89ceb1f12c6f8f1627a93f2d568d9648
Headers show

Commit Message

Jun Zhao May 10, 2019, 4:05 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>
---
 libavcodec/libvpxenc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Vignesh Venkat May 10, 2019, 7:07 p.m. UTC | #1 
From: Jun Zhao <mypopydev@gmail.com>
Date: Fri, May 10, 2019 at 9:06 AM
To: <ffmpeg-devel@ffmpeg.org>
Cc: Jun Zhao

> 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>
> ---
>  libavcodec/libvpxenc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
> index c823b8a..feb52ea 100644
> --- a/libavcodec/libvpxenc.c
> +++ b/libavcodec/libvpxenc.c
> @@ -978,7 +978,7 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out)
>         are only good through the next vpx_codec call */
>      while ((pkt = vpx_codec_get_cx_data(&ctx->encoder, &iter)) &&
>             (!ctx->is_alpha ||
> -            (ctx->is_alpha && (pkt_alpha = vpx_codec_get_cx_data(&ctx->encoder_alpha, &iter_alpha))))) {
> +            (pkt_alpha = vpx_codec_get_cx_data(&ctx->encoder_alpha, &iter_alpha)))) {
>          switch (pkt->kind) {
>          case VPX_CODEC_CX_FRAME_PKT:
>              if (!size) {
> --
> 1.7.1
>

lgtm.

> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Jun Zhao May 13, 2019, 1:35 a.m. UTC | #2 
On Sat, May 11, 2019 at 3:14 AM Vignesh Venkatasubramanian
<vigneshv-at-google.com@ffmpeg.org> wrote:
>
> From: Jun Zhao <mypopydev@gmail.com>
> Date: Fri, May 10, 2019 at 9:06 AM
> To: <ffmpeg-devel@ffmpeg.org>
> Cc: Jun Zhao
>
> > 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>
> > ---
> >  libavcodec/libvpxenc.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
> > index c823b8a..feb52ea 100644
> > --- a/libavcodec/libvpxenc.c
> > +++ b/libavcodec/libvpxenc.c
> > @@ -978,7 +978,7 @@ static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out)
> >         are only good through the next vpx_codec call */
> >      while ((pkt = vpx_codec_get_cx_data(&ctx->encoder, &iter)) &&
> >             (!ctx->is_alpha ||
> > -            (ctx->is_alpha && (pkt_alpha = vpx_codec_get_cx_data(&ctx->encoder_alpha, &iter_alpha))))) {
> > +            (pkt_alpha = vpx_codec_get_cx_data(&ctx->encoder_alpha, &iter_alpha)))) {
> >          switch (pkt->kind) {
> >          case VPX_CODEC_CX_FRAME_PKT:
> >              if (!size) {
> > --
> > 1.7.1
> >
>
> lgtm.
>
Pushed, Thanks
diff mbox

Patch

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index c823b8a..feb52ea 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -978,7 +978,7 @@  static int queue_frames(AVCodecContext *avctx, AVPacket *pkt_out)
        are only good through the next vpx_codec call */
     while ((pkt = vpx_codec_get_cx_data(&ctx->encoder, &iter)) &&
            (!ctx->is_alpha ||
-            (ctx->is_alpha && (pkt_alpha = vpx_codec_get_cx_data(&ctx->encoder_alpha, &iter_alpha))))) {
+            (pkt_alpha = vpx_codec_get_cx_data(&ctx->encoder_alpha, &iter_alpha)))) {
         switch (pkt->kind) {
         case VPX_CODEC_CX_FRAME_PKT:
             if (!size) {