Changeset df3850db in ffmpeg

Timestamp:

Jun 21, 2011, 7:14:36 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Children:

1986380d

Parents:

082b4f83 (diff), 250cebeb (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> (06/21/11 19:13:49)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/21/11 19:14:36)

Message:

Merge branch 'master' into oldabi

• master: release_notes: document not fully understood mingw-sdl issue release_notes: some updates presets: forgotten libvpx presets release_notes: fix version release_notes: mention more codecs Signed-off-by: Michael Niedermayer <​michaelni@gmx.at> release_notes: there will be 2 releases each for one ABI/API. release_notes: suggest git log instead of the poorly maintained APIChanges release_notes: we do support releases build system: disable memalign on haiku, its not reliable there. ffprobe: remove duplicate avformat_alloc_context() Fix segmentation fault in ffprobe wma: fix infinite loop Fix H.264 4:4:4 lossless decoding.

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

(No files)