diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-07-15 15:28:43 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-07-16 00:27:12 +0200 |
| commit | 59ef6bded5d01e4debf08dc65cfd4a088652759b (patch) | |
| tree | 4cd21ce070beed038088c6db91d618cdbde9765b /libavcodec/flashsvenc.c | |
| parent | 12e9bf3e845bd444223e1f326edaabd36236362f (diff) | |
flashsvenc: merge two consecutive if-conditions
Diffstat (limited to 'libavcodec/flashsvenc.c')
| -rw-r--r-- | libavcodec/flashsvenc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index ec70b72ce4..7082040670 100644 --- 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) { |