diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-18 11:44:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-18 11:44:42 +0200 |
| commit | fd46d6deac9b29b07c5d255d0c004782c85fdd7d (patch) | |
| tree | 79e6c7d787cb0b0cfe8c9818829932db499a0d87 | |
| parent | b379e1d6dfe2d9bb7b616c63e3240c8458a205d8 (diff) | |
| download | ffmpeg-fd46d6deac9b29b07c5d255d0c004782c85fdd7d.tar.gz | |
avcodec/mpegvideo_enc: Merge ifs with identical conditions
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 938546c7cb..12922acf6c 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 || |