Michael Niedermayer 5ff1b588eb Merge commit 'c2503d9c8a' ... * commit 'c2503d9c8a': swscale: ppc: Hide arch-specific initialization details Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-08-29 15:10:09 +02:00
..
Makefile	swscale: ppc: Hide arch-specific initialization details	2013-08-29 10:23:41 +02:00
swscale_altivec.c	Merge commit 'c2503d9c8a'	2013-08-29 15:10:09 +02:00
yuv2rgb_altivec.c	Merge commit 'c2503d9c8a'	2013-08-29 15:10:09 +02:00
yuv2rgb_altivec.h	Merge remote-tracking branch 'qatar/master'	2012-02-10 01:20:07 +01:00
yuv2yuv_altivec.c	Merge commit 'c2503d9c8a'	2013-08-29 15:10:09 +02:00