* commit '58396e80':
  x11grab: Use a typedef for the context, as most other code does

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