ffmpeg/libavdevice
Michael Niedermayer 8a77672645 Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'
* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
  x11grab: Unbreak building

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-01 00:17:36 +01:00
..
2015-01-26 02:04:30 -07:00
2015-01-26 02:04:30 -07:00
2014-04-24 05:12:07 +02:00
2014-08-30 18:02:45 +02:00