Changeset dfa7cb64 in ffmpeg

Timestamp:
Feb 14, 2015, 9:49:31 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e33b084e
Parents:
d2223ec2 (diff), 36cf8eb4 (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/14/15 21:46:31)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/14/15 21:49:31)
Message:

Merge commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f'

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

(No files)

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