* commit 'b31328d0':
  xcbgrab: Provide better names for the y and x option

Conflicts:
	doc/indevs.texi
	libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>