[FFmpeg-cvslog] Merge commit 'c8b8271379b200c5c6fa89ca995f90f97f55c2c5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  9 00:20:10 2015 +0200| [fcc117af30bcf59c7ae61a90bdebba0472dd3ddc] | committer: Michael Niedermayer

Merge commit 'c8b8271379b200c5c6fa89ca995f90f97f55c2c5'

* commit 'c8b8271379b200c5c6fa89ca995f90f97f55c2c5':
  xcbgrab: Explicitly include xcb/shape.h

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

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