ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Feb 25
01:12:50 2015 +0100| [2fbdf30efe994a9956a27d845010b57a5fc1deeb] | committer:
Michael Niedermayer
Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'
* commit 'b31328d008985f87f0a7c83c700847cef1a4f08c':
xcbgrab: Provide better names for the y and x option
Conflicts:
doc/indevs.texi
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fbdf30efe994a9956a27d845010b57a5fc1deeb
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
