From 59ef6bded5d01e4debf08dc65cfd4a088652759b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 15 Jul 2011 15:28:43 +0200 Subject: flashsvenc: merge two consecutive if-conditions --- libavcodec/flashsvenc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libavcodec/flashsvenc.c') 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) { -- cgit v1.2.3