Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 19:42:13 +0000 (20:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 19:42:52 +0000 (20:42 +0100)
commit3171ac209b04726496a3eaa296629d40f25c2af8
treeceea499b2fc7bbe85ad271d399b304cc80939e52
parent7d56aab2de7725bbf6fd378d1652ef531a782d72
parentd40815a982c36ff9da09ae3edb5e3bd7d97b5d42
Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'

* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
  xcbgrab: Correctly make shm optional

Conflicts:
libavdevice/xcbgrab.c

See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/xcbgrab.c