Merge "VPX: remove scaled calls from FUN_CONV_1D"
authorScott LaVarnway <slavarnway@google.com>
Tue, 11 Aug 2015 21:46:50 +0000 (21:46 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 11 Aug 2015 21:46:50 +0000 (21:46 +0000)
1  2 
vp9/encoder/vp9_encoder.c

Simple merge