Changeset 6947b0c4 in ffmpeg

Timestamp:

Mar 15, 2011, 3:48:42 PM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1c31b26b

Parents:

27293b84 (diff), c76374c6 (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/15/11 15:18:40)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/15/11 15:48:42)

Message:

Merge remote-tracking branch 'newdev/master'

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

(No files)