Changeset 3efbbbb5 in ffmpeg

Timestamp:

Mar 11, 2011, 2:00:52 PM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

27efa296

Parents:

2800e8d6 (diff), 35d7d6f7 (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> (03/11/11 13:59:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/11/11 14:00:52)

Message:

Merge remote-tracking branch 'remotes/newdev/master'

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

(No files)