Changeset 3cab2280 in ffmpeg

Timestamp:
Jul 22, 2013, 9:55:40 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2305a677
Parents:
1573274b (diff), d6e4f5fe (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> (07/22/13 09:55:20)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/22/13 09:55:40)
Message:

Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0'

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

(No files)

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