tree fc5d034756032b4ecd5e946be31ba93f3c6350ca
parent 4b00f0ecae8869226cb4fccaa8a1262a34a44196
parent 654d2163c9c654f90267708c2d1d146f762a9e48
author James Zern <jzern@google.com> 1456541800 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1456541801 +0000

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 |