From a33705a684352f73b1afc180a9c77a88439b55a4 Mon Sep 17 00:00:00 2001 From: Christophe Massiot Date: Sun, 22 Sep 2002 14:53:52 +0000 Subject: [PATCH] Fixed a bug in the conversion splitter. --- src/audio_output/filters.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c index 644870d904..05024856f8 100644 --- a/src/audio_output/filters.c +++ b/src/audio_output/filters.c @@ -2,7 +2,7 @@ * filters.c : audio output filters management ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: filters.c,v 1.9 2002/09/02 23:17:06 massiot Exp $ + * $Id: filters.c,v 1.10 2002/09/22 14:53:52 massiot Exp $ * * Authors: Christophe Massiot * @@ -90,25 +90,19 @@ static int SplitConversion( aout_instance_t * p_aout, if ( i_nb_conversions == 2 ) { - if ( !b_format ) + if ( !b_format || !b_channels ) { p_middle_format->i_rate = p_input_format->i_rate; return 1; } - if ( !b_rate ) - { - p_middle_format->i_channels = p_input_format->i_channels; - return 1; - } - - /* !b_channels */ - p_middle_format->i_rate = p_input_format->i_rate; + /* !b_rate */ + p_middle_format->i_channels = p_input_format->i_channels; return 1; } /* i_nb_conversion == 3 */ - p_middle_format->i_channels = p_input_format->i_channels; + p_middle_format->i_rate = p_input_format->i_rate; return 2; } -- 2.39.2