Michael Niedermayer a38a1d516f Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96' ...

* commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96':
  xcbgrab: XCB-based screen capture

Conflicts:
	Changelog
	configure
	libavdevice/Makefile
	libavdevice/alldevices.c
	libavdevice/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-27 21:26:51 +01:00

3.1 KiB

Raw Blame History

View Raw