Changeset 045d8007 in ffmpeg

Timestamp:
Jan 17, 2014, 2:05:24 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5049b6a1
Parents:
68ebf70f (diff), 045654f4 (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> (01/17/14 14:05:17)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/17/14 14:05:24)
Message:

Merge commit '045654f422e74be8ed09a0819d39051d67633a09'

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

(No files)

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