Changeset 27efa296 in ffmpeg

Timestamp:

Mar 12, 2011, 4:55:59 PM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a0a1b7b9

Parents:

3efbbbb5 (diff), 0215006a (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.

Message:

Merge branch 'master' of ​git://git.ffmpeg.org/ffmpeg

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

(No files)