[FFmpeg-cvslog] Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 27 21:26:51 2014 +0100| [a38a1d516fe68542523c772af27e41f28ae9852c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a38a1d516fe68542523c772af27e41f28ae9852c
---