mirror of https://github.com/FFmpeg/FFmpeg.git
* commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff':
xcbgrab: Check for xcb-shape
Conflicts:
configure
See: 792f0f2045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/110/merge
commit
7d56aab2de