Changeset 0fecf264 in ffmpeg

Timestamp:

Mar 17, 2011, 4:22:52 PM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a6be21d3

Parents:

e309fdc7 (diff), f1f60f52 (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/17/11 15:53:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/11 16:22:52)

Message:

Merge remote-tracking branch 'newdev/master'

Conflicts:

Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h

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

(No files)