Michael Niedermayer 45a73d2b47 Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' ...

* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
  swscale: ppc: Remove commented-out define cruft
  nsvdec: Remove commented-out debug cruft
  cpu: Restructure code to avoid pointless ret variable indirection

Conflicts:
	libavutil/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-06-03 11:53:05 +02:00

..

Makefile

…

swscale_altivec.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

yuv2rgb_altivec.c

Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'

2013-06-03 11:53:05 +02:00

yuv2rgb_altivec.h

…

yuv2yuv_altivec.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00