Merge "VPX: scaled convolve : fix windows build errors"
authorScott LaVarnway <slavarnway@google.com>
Fri, 21 Aug 2015 12:06:34 +0000 (12:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 21 Aug 2015 12:06:34 +0000 (12:06 +0000)

Trivial merge