Changeset 41572ac6 in ffmpeg

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

Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'

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

(No files)

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