Merge "Adding vpx_image_scale() function in vpxdec."
authorDmitry Kovalev <dkovalev@google.com>
Fri, 17 Jan 2014 20:56:58 +0000 (12:56 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 17 Jan 2014 20:56:58 +0000 (12:56 -0800)

Trivial merge