Merge "Add adaptation option for VBR."

diff --cc vp9/encoder/vp9_firstpass.c
Simple merge

diff --cc vp9/encoder/vp9_firstpass.h
index 458cd9b,2063e35..6cc5a5f
--- 1/vp9/encoder/vp9_firstpass.h
--- 2/vp9/encoder/vp9_firstpass.h
+++ b/vp9/encoder/vp9_firstpass.h
@@@ -109,7 -111,11 +111,9 @@@ typedef struct 
  
    int kf_zeromotion_pct;
    int last_kfgroup_zeromotion_pct;
 -  int gf_zeromotion_pct;
 -
    int active_worst_quality;
+   int extend_minq;
+   int extend_maxq;
  
    GF_GROUP gf_group;
  } TWO_PASS;

diff --cc vp9/encoder/vp9_ratectrl.c
Simple merge