Merge "Combine vp9_encode_block_intra and encode_block_intra"
authorHui Su <huisu@google.com>
Thu, 30 Oct 2014 18:02:31 +0000 (11:02 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 30 Oct 2014 18:02:31 +0000 (11:02 -0700)
1  2 
vp9/encoder/vp9_rdopt.c

Simple merge