Changeset 3171ac20 in ffmpeg

Timestamp:

Feb 15, 2015, 7:42:52 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3773b6ed

Parents:

7d56aab2 (diff), d40815a9 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (02/15/15 19:42:13)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/15/15 19:42:52)

Message:

Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'

• commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42': xcbgrab: Correctly make shm optional

Conflicts:

libavdevice/xcbgrab.c

See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)