Changeset ff4548f2 in ffmpeg

Timestamp:
Sep 17, 2013, 8:53:14 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ede42109
Parents:
7129935e (diff), 187105ff (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> (09/17/13 08:38:48)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/17/13 08:53:14)
Message:

Merge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'

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

(No files)

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