[FFmpeg-cvslog] lavc/libvpxenc: remove redundant condition check

Jun Zhao git at videolan.org
Sun May 12 09:53:46 EEST 2019


ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Fri May 10 21:02:40 2019 +0800| [f82a02aa89ceb1f12c6f8f1627a93f2d568d9648] | committer: Jun Zhao

lavc/libvpxenc: remove redundant condition check

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

Signed-off-by: Jun Zhao <barryjzhao at tencent.com>

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

 libavcodec/libvpxenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index c823b8ad8b..feb52ea0dd 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) {



More information about the ffmpeg-cvslog mailing list