[FFmpeg-cvslog] avcodec/mpegvideo_enc: Merge ifs with identical conditions

Michael Niedermayer git at videolan.org
Sun Oct 18 12:12:51 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Oct 18 11:44:42 2015 +0200| [fd46d6deac9b29b07c5d255d0c004782c85fdd7d] | committer: Michael Niedermayer

avcodec/mpegvideo_enc: Merge ifs with identical conditions

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/mpegvideo_enc.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 938546c..12922ac 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -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 ||



More information about the ffmpeg-cvslog mailing list