45a73d2b47
* 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>