mpegvideo_enc: Merge ifs with identical conditions
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 23 Oct 2015 13:23:42 +0000 (15:23 +0200)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Sun, 25 Oct 2015 21:24:13 +0000 (22:24 +0100)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/mpegvideo_enc.c

index 226a24f..9dd30e6 100644 (file)
@@ -997,9 +997,7 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
                 pts = display_picture_number;
             }
         }
-    }
 
-    if (pic_arg) {
         if (!pic_arg->buf[0] ||
             pic_arg->linesize[0] != s->linesize ||
             pic_arg->linesize[1] != s->uvlinesize ||