From 8821ae649e61097ec57ca58472c3e4239c82913c Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 29 Jul 2012 19:22:19 -0400 Subject: lavr: fix handling of custom mix matrices Adds some validation for changing parameters after setting the matrix and fixes a bug in the conversion path setup. --- libavresample/utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libavresample/utils.c') diff --git a/libavresample/utils.c b/libavresample/utils.c index 89a82b9dda..2d83372bb8 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -48,9 +48,8 @@ int avresample_open(AVAudioResampleContext *avr) avr->resample_channels = FFMIN(avr->in_channels, avr->out_channels); avr->downmix_needed = avr->in_channels > avr->out_channels; avr->upmix_needed = avr->out_channels > avr->in_channels || - avr->am->matrix || - (avr->out_channels == avr->in_channels && - avr->in_channel_layout != avr->out_channel_layout); + (!avr->downmix_needed && (avr->am->matrix || + avr->in_channel_layout != avr->out_channel_layout)); avr->mixing_needed = avr->downmix_needed || avr->upmix_needed; /* set resampling parameters */ -- cgit v1.2.3