ffmpeg/libavutil
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-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-07-16 19:30:13 +00:00
2012-12-05 20:25:32 +01:00
2013-03-07 01:12:04 +01:00
2013-05-24 15:36:54 +02:00
2013-04-13 23:48:26 +02:00
2012-10-31 17:01:52 +01:00
2013-01-24 00:49:47 +01:00
2013-03-19 00:47:00 +01:00
2013-05-15 23:53:40 +02:00
2013-05-29 22:31:16 +02:00
2012-08-09 01:44:15 +02:00
2013-06-02 11:27:19 +02:00
2013-05-17 21:16:02 +02:00
2013-05-13 13:52:31 +02:00
2013-05-13 13:52:31 +02:00
2013-05-15 12:10:09 +02:00
2013-05-13 21:42:37 +02:00
2013-05-21 20:50:49 +00:00
2013-05-17 11:32:53 +00:00
2013-04-15 20:31:06 +02:00
2013-05-22 21:18:08 +02:00
2013-06-02 11:27:19 +02:00
2013-06-02 18:51:09 +02:00
2012-10-28 14:33:41 +01:00
2012-10-31 03:10:35 +01:00
2012-10-28 14:33:41 +01:00