[FFmpeg-cvslog] Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'

Michael Niedermayer git at videolan.org
Wed Sep 3 13:49:38 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  3 13:29:49 2014 +0200| [33bf66af02fe07ad810bea792782388c34be5e66] | committer: Michael Niedermayer

Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33bf66af02fe07ad810bea792782388c34be5e66
---





More information about the ffmpeg-cvslog mailing list