Changeset a20480e6 in ffmpeg

Timestamp:
Apr 4, 2014, 1:09:52 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
35617366
Parents:
fb61ed1e (diff), 28743243 (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/04/14 13:09:45)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/04/14 13:09:52)
Message:

Merge commit '287432430c5c9cb8ffe1da1376949de494f24e45'

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

(No files)

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