Changeset 6c44dd6c in ffmpeg

Timestamp:
Feb 14, 2015, 9:32:23 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d2223ec2
Parents:
877c038a (diff), 8a213179 (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:31:53)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/14/15 21:32:23)
Message:

Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'

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

(No files)

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