-
Michael Niedermayer authored
* commit 'c16bfb14': swscale: x86: Consistently use lowercase function name suffixes Conflicts: libswscale/x86/rgb2rgb.c libswscale/x86/swscale.c See: 1de064e2Merged-by: Michael Niedermayer <michaelni@gmx.at>
8733b363
* commit 'c16bfb14': swscale: x86: Consistently use lowercase function name suffixes Conflicts: libswscale/x86/rgb2rgb.c libswscale/x86/swscale.c See: 1de064e2Merged-by: Michael Niedermayer <michaelni@gmx.at>