Changeset ac7128a9 in ffmpeg

Timestamp:
Feb 20, 2015, 8:48:32 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d19ca4b2
Parents:
48e661b3 (diff), 176903c (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/20/15 20:48:14)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/20/15 20:48:32)
Message:

Merge commit '176903ce833ce7469f411640e9748a0d549b5285'

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

(No files)

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