Changeset 946902e5 in ffmpeg

Timestamp:
Aug 28, 2013, 10:03:06 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
f0ee0341
Parents:
a13af77f (diff), f4634ae8 (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> (08/28/13 10:03:00)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/28/13 10:03:06)
Message:

Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'

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

(No files)

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