Changeset 9d228676 in ffmpeg

Timestamp:
Jan 15, 2014, 4:16:21 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
53e6977c
Parents:
2df53e0f (diff), 032d4da8 (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/15/14 04:16:09)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/15/14 04:16:21)
Message:

Merge commit '032d4da8af353e32ab5c86ee3a210f6065921a4a'

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

(No files)

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