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 |