From: John Koleszar <jkoleszar@google.com>
Date: Sat, 8 Jan 2011 05:05:08 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~522
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cb26b486490b4961fd5c7d897112b12a121a3e7;p=libvpx

Merge remote branch 'origin/master' into experimental

Change-Id: Ib34bc09a295141eb65c8c0478bde6136f178909b
---

3cb26b486490b4961fd5c7d897112b12a121a3e7
diff --cc vp8/vp8_cx_iface.c
index a833ea5cf,4c7aca520..09a9151bc
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@@ -37,8 -37,8 +37,9 @@@ struct vp8_extracf
      unsigned int                arnr_max_frames;    /* alt_ref Noise Reduction Max Frame Count */
      unsigned int                arnr_strength;    /* alt_ref Noise Reduction Strength */
      unsigned int                arnr_type;        /* alt_ref filter type */
 +    unsigned int                experimental;
      vp8e_tuning                 tuning;
+     unsigned int                cq_level;         /* constrained quality level */
  
  };
  
@@@ -69,8 -69,8 +70,9 @@@ static const struct extraconfig_map ext
              0,                          /* arnr_max_frames */
              3,                          /* arnr_strength */
              3,                          /* arnr_type*/
 +            0,                          /* experimental mode */
              0,                          /* tuning*/
+             10,                         /* cq_level */
          }
      }
  };