[FFmpeg-cvslog] Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 10 12:20:23 2014 +0100| [81a045fe17d533192a9fb897cb4d71ed44c877e3] | committer: Michael Niedermayer

Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'

* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33':
  xcbgrab: Support empty filename string correctly

Conflicts:
	libavdevice/xcbgrab.c

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

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