Merge "Set scaled img format correctly in vpxdec"
authorDeb Mukherjee <debargha@google.com>
Tue, 26 Aug 2014 17:36:47 +0000 (10:36 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 26 Aug 2014 17:36:47 +0000 (10:36 -0700)
1  2 
vpxdec.c

diff --cc vpxdec.c
Simple merge