* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b': xcbgrab: Unbreak parsing filename options Conflicts: libavdevice/xcbgrab.c See: db442c8736 Merged-by: Michael Niedermayer <michaelni@gmx.at>
db442c8736