* commit 'f07a4290':
  x11grab: K&R formatting cosmetics

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