ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Mar 1
00:17:36 2015 +0100| [8a776726457ad20afc4e7cf9115b309034dd0f25] | committer:
Michael Niedermayer
Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'
* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
x11grab: Unbreak building
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a776726457ad20afc4e7cf9115b309034dd0f25
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
