Michael Niedermayer 521f569734 Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'
* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273':
  idctdsp: prettyprinting cosmetics

Conflicts:
	libavcodec/idctdsp.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/idctdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18 22:16:04 +02:00
..
2014-06-08 02:37:20 +02:00
2014-06-08 02:37:20 +02:00
2014-04-11 12:09:09 +02:00
2014-02-24 08:30:19 +01:00
2014-05-21 03:25:08 +02:00
2014-06-25 14:49:44 +02:00
2014-05-29 21:47:40 +02:00
2014-06-05 20:31:59 +02:00
2014-04-19 09:56:01 +02:00
2014-05-21 03:25:08 +02:00
2014-06-08 02:37:20 +02:00
2014-03-29 18:13:15 +01:00
2014-04-19 09:56:01 +02:00