From 42b5688d5ed340c9298650a7b8e88bb8b2c56c8c Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Tue, 11 Dec 2012 15:56:17 -0500 Subject: lavr: fix segfault due to overlooked change needed in 14758e3 Signed-off-by: Luca Barbato --- libavresample/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavresample/utils.c') diff --git a/libavresample/utils.c b/libavresample/utils.c index 8245e6a345..fe2e1c266b 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -49,7 +49,7 @@ 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->downmix_needed && (avr->am->matrix || + (!avr->downmix_needed && (avr->mix_matrix || avr->in_channel_layout != avr->out_channel_layout)); avr->mixing_needed = avr->downmix_needed || avr->upmix_needed; -- cgit v1.2.3