* commit 'c011ceef':
  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>