Changeset 30c863fd in ffmpeg

Timestamp:
Feb 24, 2015, 9:03:19 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
eb24186b
Parents:
8c1c0693 (diff), 3cd5828f (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 21:03:14)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/24/15 21:03:19)
Message:

Merge commit '3cd5828fc0007e6d056067444de053a34ddedd02'

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

(No files)

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