Merge changes I121fe66c,I94f57f8a
authorPaul Wilkins <paulwilkins@google.com>
Thu, 13 Feb 2014 17:31:53 +0000 (09:31 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 13 Feb 2014 17:31:53 +0000 (09:31 -0800)
commitd84978b84fc8f3b329e60b77d4180000136b81f2
tree350392ee0a5b27f73442866d1f2358fff9ea7fe5
parent32d07c626e09c504f91b1396876a52df376e9c30
parentc30a9cd97dbeee9cdd18527e9571304cb01d0073
Merge changes I121fe66c,I94f57f8a

* changes:
  Remove some cases for turning off arf.
  Modified Aq1 and Aq2
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_firstpass.c
vp9/encoder/vp9_onyx_if.c