Merge "Inlining setup_key_frame() and setup_inter_frame()."
authorDmitry Kovalev <dkovalev@google.com>
Tue, 13 May 2014 22:00:22 +0000 (15:00 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 13 May 2014 22:00:22 +0000 (15:00 -0700)
1  2 
vp9/encoder/vp9_encoder.c

Simple merge