ffmpeg/libavdevice
Michael Niedermayer 5393c9dadd Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'
* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
  x11grab: K&R formatting cosmetics

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 21:21:47 +02:00
..
2014-04-11 17:51:33 +02:00
2014-04-22 20:44:31 +02:00
2014-08-27 19:17:58 +02:00
2014-08-07 13:03:17 +02:00
2012-12-21 00:18:34 +01:00
2014-06-03 10:58:19 -08:00
2014-04-24 05:12:07 +02:00
2014-07-31 18:59:20 +02:00
2014-06-30 21:32:19 +02:00