ref: 2089b2cee545f97fe49201a9b081c4263fcd1474
parent: aeca599087409c83cf4e24a59b5830a380e22327
parent: 8d5ce819dd8c4f7f121c55ebcd3552aba36740e0
author: John Koleszar <jkoleszar@google.com>
date: Mon Apr 25 05:35:12 EDT 2011
Merge "bug fix possible keyframe context divide by zero"
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -1468,8 +1468,10 @@
/* Assume a default of 1 kf every 2 seconds, or the max kf interval,
* whichever is smaller.
*/
+ int key_freq = cpi->oxcf.key_freq>0 ? cpi->oxcf.key_freq : 1;
av_key_frame_frequency = (int)cpi->output_frame_rate * 2;
- if (av_key_frame_frequency > cpi->oxcf.key_freq)
+
+ if (cpi->oxcf.auto_key && av_key_frame_frequency > key_freq)
av_key_frame_frequency = cpi->oxcf.key_freq;
cpi->prior_key_frame_distance[KEY_FRAME_CONTEXT - 1]
--
⑨