[FFmpeg-cvslog] Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 30 21:59:56 2015 +0200| [dc83733f2bf2f26433bbf23d42fe92a2c7691df1] | committer: Michael Niedermayer

Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b'

* commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b':
  xcbgrab: Do not assume the non shm image data is always available

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

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