Changeset 6e9bbaca in ffmpeg

Timestamp:
Feb 24, 2015, 11:33:09 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7d9b06eb
Parents:
79052cd4 (diff), 8a273a74 (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/24/15 23:32:57)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/24/15 23:33:09)
Message:

Merge commit '8a273a746061a112e5e35066a8fd8e146d821a62'

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

(No files)

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