[FFmpeg-cvslog] Merge commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 15 20:38:34 2015 +0100| [7d56aab2de7725bbf6fd378d1652ef531a782d72] | committer: Michael Niedermayer

Merge commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff'

* commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff':
  xcbgrab: Check for xcb-shape

Conflicts:
	configure

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

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