ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Aug 28
21:39:19 2014 +0200| [65c9e2d0030d76c055461e25e22b9e8fa641560d] | committer:
Michael Niedermayer
Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'
* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
x11grab: Small near-cosmetic refactorings
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65c9e2d0030d76c055461e25e22b9e8fa641560d
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
