avcodec/mpegvideo_enc: Merge ifs with identical conditions

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-10-18 11:44:42 +02:00
parent b379e1d6df
commit fd46d6deac

View 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 ||