projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
12e9bf3
)
flashsvenc: merge two consecutive if-conditions
author
Diego Biurrun
<diego@biurrun.de>
Fri, 15 Jul 2011 13:28:43 +0000
(15:28 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Fri, 15 Jul 2011 22:27:12 +0000
(
00:27
+0200)
libavcodec/flashsvenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/flashsvenc.c
b/libavcodec/flashsvenc.c
index
ec70b72
..
7082040
100644
(file)
--- a/
libavcodec/flashsvenc.c
+++ b/
libavcodec/flashsvenc.c
@@
-230,10
+230,9
@@
static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf,
pfptr = s->previous_frame;
/* Check the placement of keyframes */
- if (avctx->gop_size > 0) {
- if (avctx->frame_number >= s->last_key_frame + avctx->gop_size) {
- I_frame = 1;
- }
+ if (avctx->gop_size > 0 &&
+ avctx->frame_number >= s->last_key_frame + avctx->gop_size) {
+ I_frame = 1;
}
if (buf_size < s->image_width * s->image_height * 3) {