[FFmpeg-cvslog] Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 15 20:42:13 2015 +0100| [3171ac209b04726496a3eaa296629d40f25c2af8] | committer: Michael Niedermayer

Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'

* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
  xcbgrab: Correctly make shm optional

Conflicts:
	libavdevice/xcbgrab.c

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

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