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