summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo_enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-10-23 15:23:42 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-10-25 22:24:13 +0100
commit27eeee76b2546fd313808997b3d07ba9cce94551 (patch)
treee49d6bad19985251f93adca1715d844583b79da1 /libavcodec/mpegvideo_enc.c
parentf0a88d4d2a74534460f4a8b79c448bd5890dbd41 (diff)
mpegvideo_enc: Merge ifs with identical conditions
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r--libavcodec/mpegvideo_enc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 226a24fe2d..9dd30e6a2d 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 ||