opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-01 13:36:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

flashsvenc: merge two consecutive if-conditions

Browse Source
This commit is contained in:
Diego Biurrun
2011-07-15 15:28:43 +02:00
parent 12e9bf3e84
commit 59ef6bded5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/flashsvenc.c
View File

@ -230,10 +230,9 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf,
pfptr = s->previous_frame; pfptr = s->previous_frame;
/* Check the placement of keyframes */ /* Check the placement of keyframes */
if (avctx->gop_size > 0) { if (avctx->gop_size > 0 &&
if (avctx->frame_number >= s->last_key_frame + avctx->gop_size) { avctx->frame_number >= s->last_key_frame + avctx->gop_size) {
I_frame = 1; I_frame = 1;
}
} }
if (buf_size < s->image_width * s->image_height * 3) { if (buf_size < s->image_width * s->image_height * 3) {