Changeset 6530e2ff in ffmpeg

Timestamp:

Apr 11, 2015, 3:59:21 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

816bbc1

Parents:

d6bcdf0d (diff), 7a9b764c (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> (04/11/15 15:47:19)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/11/15 15:59:21)

Message:

Merge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'

• commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2': libdc1394: Unbreak build after c201069fa

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

(No files)