[FFmpeg-cvslog] Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 11:53:05 2013 +0200| [45a73d2b472ffcc0d87f3efae3424c44976d6935] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45a73d2b472ffcc0d87f3efae3424c44976d6935
---