OSDN Git Service

avcodec/mpegvideo_enc: Merge ifs with identical conditions
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 18 Oct 2015 09:44:42 +0000 (11:44 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 18 Oct 2015 09:44:42 +0000 (11:44 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/mpegvideo_enc.c

index 938546c..12922ac 100644 (file)
@@ -1157,9 +1157,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 ||