Changeset 2fbdf30e in ffmpeg

Timestamp:

Feb 25, 2015, 12:12:50 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a1b5cf01

Parents:

53dd75e9 (diff), b31328d0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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@gmx.at>

(No files)