Changeset a0d5204c in ffmpeg

Timestamp:
Feb 4, 2014, 12:44:39 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
905cd28a
Parents:
8a3b85f3 (diff), b25e84b7 (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> (02/04/14 12:44:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/04/14 12:44:39)
Message:

Merge commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e'

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

(No files)

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