Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 09:53:05 +0000 (11:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 09:53:05 +0000 (11:53 +0200)
commit45a73d2b472ffcc0d87f3efae3424c44976d6935
tree454bf430eab79d20b8a7c4ac609ee70260188a16
parent7cb5467a52011d194289035b51e27c4df80bf2a2
parentc011ceef78eae66039efc66d9551a7146e08838a
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>
libavformat/nsvdec.c
libavutil/cpu.c
libswscale/ppc/yuv2rgb_altivec.c