* commit '85b3b1c4':
  xcbgrab: Unbreak parsing filename options

Conflicts:
	libavdevice/xcbgrab.c

See: db442c87Merged-by: Michael Niedermayer <michaelni@gmx.at>