Changeset 375fa061 in ffmpeg

Timestamp:
Jun 9, 2014, 3:25:09 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2ffe55a6
Parents:
383d8ddf (diff), 1619274f (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> (06/09/14 15:13:56)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/09/14 15:25:09)
Message:

Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772'

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

(No files)

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