Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 11:29:49 +0000 (13:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 11:30:24 +0000 (13:30 +0200)
commit33bf66af02fe07ad810bea792782388c34be5e66
tree62bee5972ad5dae646149588cb373dd2914b15f3
parent34e80af860d6254250878d311a1aba183d0a5382
parentbb3ead7e54fec205c595cfb8b1d8900d50d3d1cc
Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'

* commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc':
  x11grab: Fallback to normal XImage if SHM is not supported

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/x11grab.c