Changeset 97bd0e2a in ffmpeg

Timestamp:
Feb 17, 2015, 10:42:54 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
77ae9472
Parents:
d06dce21 (diff), c78dc121 (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/17/15 22:42:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/17/15 22:42:54)
Message:

Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'

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

(No files)

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