Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Apr 2015 19:59:56 +0000 (21:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Apr 2015 20:00:10 +0000 (22:00 +0200)
* commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b':
  xcbgrab: Do not assume the non shm image data is always available

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

Simple merge