Changeset eb5a308d in ffmpeg

Timestamp:
May 31, 2015, 11:17:26 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
fd116b8d
Parents:
f5ee10c1 (diff), 31a117a0 (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/31/15 23:17:03)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/31/15 23:17:26)
Message:

Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'

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

(No files)

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