Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Feb 2015 00:33:18 +0000 (01:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Feb 2015 00:44:49 +0000 (01:44 +0100)
commita1b5cf01816884f89345004d6f8b89f6448a36ef
tree5b23a50d92642193584d77d4244663514d4332f2
parent2fbdf30efe994a9956a27d845010b57a5fc1deeb
parent85b3b1c4ba7af9c2658442b0aafd27d613e1854b
Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'

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

Conflicts:
libavdevice/xcbgrab.c

See: db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/xcbgrab.c