commit e05cea787872dc2f9ef163a62ca9021955730f71
author Jerome Jiang <jianj@google.com> Wed Feb 06 00:33:30 2019
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 06 00:33:30 2019
tree 9d75eb1be09eacac0aaa5f69fbc11a9d7571f7dc
parent f7779e73901d0288df7119dfcb8086fe1710cbda
parent 9b2378bdf7868c4ed955ec719a9a8eac1465f676

Merge "Fix VPX_KF_DISABLED."

vp9/encoder/vp9_ratectrl.c

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 9df2eb3..e342250 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -2271,7 +2271,7 @@
   RATE_CONTROL *const rc = &cpi->rc;
   int target;
   if ((cm->current_video_frame == 0) || (cpi->frame_flags & FRAMEFLAGS_KEY) ||
-      rc->frames_to_key == 0) {
+      (cpi->oxcf.auto_key && rc->frames_to_key == 0)) {
     cm->frame_type = KEY_FRAME;
     rc->frames_to_key = cpi->oxcf.key_freq;
     rc->kf_boost = DEFAULT_KF_BOOST;