[FFmpeg-cvslog] Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 25 01:33:18 2015 +0100| [a1b5cf01816884f89345004d6f8b89f6448a36ef] | committer: Michael Niedermayer

Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'

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

Conflicts:
	libavdevice/xcbgrab.c

See: db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1b5cf01816884f89345004d6f8b89f6448a36ef
---