Merge "Moving framerate from VP9EncoderConfig to VP9_COMP."
authorDmitry Kovalev <dkovalev@google.com>
Fri, 15 Aug 2014 01:26:35 +0000 (18:26 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 15 Aug 2014 01:26:35 +0000 (18:26 -0700)
1  2 
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.h
vp9/encoder/vp9_ratectrl.c
vp9/vp9_cx_iface.c

Simple merge
Simple merge
Simple merge
Simple merge