Changeset 82edf672 in ffmpeg

Timestamp:

Jun 18, 2012, 6:07:00 PM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b90f83e9

Parents:

f87dacb2 (diff), f61ce90c (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/18/12 18:05:32)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/18/12 18:07:00)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs Add Dolby/DPLII downmix support to libavresample vorbisdec: replace div/mod in loop with a counter fate: vorbis: add 5.1 surround test rtpenc: Allow requesting H264 RTP packetization mode 0 configure: Sort the library listings in the help text alphabetically dwt: remove variable-length arrays RTMPT protocol support http: Properly handle chunked transfer-encoding for replies to post data http: Fail reading if the connection has gone away amr: Mark an array const amr: More space cleanup rtpenc: Fix memory leaks in the muxer open function

Conflicts:

Changelog
configure
doc/APIchanges
libavformat/version.h

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

(No files)