
* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557': swscale: cosmetics: Drop silly camelCase from swScale function pointer name Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557': swscale: cosmetics: Drop silly camelCase from swScale function pointer name Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>