Merge "resolve clang issue : implicit convert tx_mode -> tx_size"
authorJim Bankoski <jimbankoski@google.com>
Wed, 11 Sep 2013 20:40:11 +0000 (13:40 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 11 Sep 2013 20:40:11 +0000 (13:40 -0700)
1  2 
vp9/encoder/vp9_encodeframe.c

Simple merge