Merge "Add codec control function for enabling frame_periodic_boost."

author Marco Paniconi <marpan@google.com>

Thu, 3 Apr 2014 23:57:44 +0000 (16:57 -0700)

committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>

Thu, 3 Apr 2014 23:57:44 +0000 (16:57 -0700)
author Marco Paniconi <marpan@google.com>
Thu, 3 Apr 2014 23:57:44 +0000 (16:57 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 3 Apr 2014 23:57:44 +0000 (16:57 -0700)
diff --cc vp9/encoder/vp9_speed_features.c
Simple merge
author	Marco Paniconi <marpan@google.com>
	Thu, 3 Apr 2014 23:57:44 +0000 (16:57 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Thu, 3 Apr 2014 23:57:44 +0000 (16:57 -0700)