Changeset 97f7586c in ffmpeg

Timestamp:

May 28, 2013, 5:49:38 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

91db8ff

Parents:

9c66da51 (diff), 5f30c6c8 (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> (05/28/13 05:48:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/28/13 05:49:38)

Message:

Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d'

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

(No files)