* commit '65e78a2e':
  x11grab: Refactor pixel format parsing

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