OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b379e1d
)
avcodec/mpegvideo_enc: Merge ifs with identical conditions
author
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 18 Oct 2015 09:44:42 +0000
(11:44 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 18 Oct 2015 09:44:42 +0000
(11:44 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/mpegvideo_enc.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo_enc.c
b/libavcodec/mpegvideo_enc.c
index
938546c
..
12922ac
100644
(file)
--- 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 ||