diff options
author | John Stebbins <jstebbins.hb@gmail.com> | 2012-06-09 13:45:49 -0700 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-06-18 10:55:00 -0400 |
commit | 3971be0eb5d382b85f1d8772c51f21cccdc68eab (patch) | |
tree | 64e5acdc9baf7c63d0d97af6e94d0ed422099389 /libavresample/audio_mix.c | |
parent | 9fcda25e35bc012ee9a434faf0fb00bece85be6d (diff) | |
download | ffmpeg-3971be0eb5d382b85f1d8772c51f21cccdc68eab.tar.gz |
Add Dolby/DPLII downmix support to libavresample
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
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; |