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
..
2012-04-12 21:30:13 +02:00
2012-10-08 21:06:57 +02:00
2013-06-03 11:53:05 +02:00
2012-02-10 01:20:07 +01:00
2012-12-21 17:32:52 +01:00