-
Michael Niedermayer authored
* commit 'c1eb3e7f': swscale: add support for endianness only conversion Conflicts: libswscale/utils.c libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2060d944
* commit 'c1eb3e7f': swscale: add support for endianness only conversion Conflicts: libswscale/utils.c libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>