ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri Oct 23 15:23:42 2015 +0200| [27eeee76b2546fd313808997b3d07ba9cce94551] | committer: Vittorio Giovara
mpegvideo_enc: Merge ifs with identical conditions Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27eeee76b2546fd313808997b3d07ba9cce94551 --- libavcodec/mpegvideo_enc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 226a24f..9dd30e6 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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 || _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
