ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Aug 28
21:21:47 2014 +0200| [5393c9dadd23f33ca5e22a904131fccffb7ec070] | committer:
Michael Niedermayer
Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'
* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
x11grab: K&R formatting cosmetics
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5393c9dadd23f33ca5e22a904131fccffb7ec070
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
