Changeset 5c416080 in ffmpeg

Timestamp:
May 28, 2015, 7:12:53 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
f0b99112
Parents:
7b457907 (diff), dd4d709b (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> (05/28/15 19:12:25)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/28/15 19:12:53)
Message:

Merge commit 'dd4d709be705edaec0bc35c426bf8434e942b7df'

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.