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

Conflicts:
	Changelog
	configure
	libavdevice/Makefile
	libavdevice/alldevices.c
	libavdevice/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>