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