Merge changes I95159bcb,Ia74e3097,I661f6439
authorJames Zern <jzern@google.com>
Sat, 27 Feb 2016 02:56:40 +0000 (02:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 27 Feb 2016 02:56:41 +0000 (02:56 +0000)
commit3b5cb2dbe09b9b1a0436ddcb96a48ba7dfe0d2a1
treefc5d034756032b4ecd5e946be31ba93f3c6350ca
parent4b00f0ecae8869226cb4fccaa8a1262a34a44196
parent654d2163c9c654f90267708c2d1d146f762a9e48
Merge changes I95159bcb,Ia74e3097,I661f6439

* changes:
  x86/convolve.h: remove redundant check in FUN_CONV_2D
  x86/convolve.h: replace while w/if for w < 16
  x86/convolve.h: change filter[] || chains to |