5ff1b588eb
* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19': swscale: ppc: Hide arch-specific initialization details Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>