Merge "Fix skip_txfm issue in rdopt code"
authorYunqing Wang <yunqingwang@google.com>
Tue, 7 Oct 2014 22:13:44 +0000 (15:13 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 7 Oct 2014 22:13:44 +0000 (15:13 -0700)
1  2 
vp9/encoder/vp9_rdopt.c

Simple merge