diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 20:38:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 20:39:36 +0100 |
commit | 7d56aab2de7725bbf6fd378d1652ef531a782d72 (patch) | |
tree | 30874cb6fd4c37059ed8d419b0a7f704cb8ffb5c | |
parent | fe03456cdcc8ca5ee045dffd6e9989320f1fb2b1 (diff) | |
parent | c23ccaf98827cffa651cec3bfa5e57457dfc9dff (diff) | |
download | ffmpeg-streaming-7d56aab2de7725bbf6fd378d1652ef531a782d72.zip ffmpeg-streaming-7d56aab2de7725bbf6fd378d1652ef531a782d72.tar.gz |
Merge commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff'
* commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff':
xcbgrab: Check for xcb-shape
Conflicts:
configure
See: 792f0f20456cc24f1f1b9ee445e50737d65e38df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions