diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 22:05:32 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 22:07:00 +0400 |
| commit | 82edf6727f0663601351081ca1e4fb20d1752972 (patch) | |
| tree | 12479c3ec8cedfa0ec4dda38a72023224f2b5b73 /libavresample/audio_mix.c | |
| parent | f87dacb27de93f995cb18f9dcc73581ef8fc157b (diff) | |
| parent | f61ce90caa909d131ea6ec205823568a38115529 (diff) | |
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>
Diffstat (limited to 'libavresample/audio_mix.c')
| -rw-r--r-- | libavresample/audio_mix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index 7ab11b0d4d..93192221cd 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -320,7 +320,8 @@ int ff_audio_mix_init(AVAudioResampleContext *avr) avr->center_mix_level, avr->surround_mix_level, avr->lfe_mix_level, 1, matrix_dbl, - avr->in_channels); + avr->in_channels, + avr->matrix_encoding); if (ret < 0) { av_free(matrix_dbl); return ret; |