[FFmpeg-cvslog] Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'

Michael Niedermayer git at videolan.org
Wed Feb 25 01:19:21 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at 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 <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list