From 06c17625a66fef7cb012f60da1fbbf0d5cce458d Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sat, 23 Aug 2003 16:15:47 +0000 Subject: [PATCH] * faad: fix SBR handling. --- modules/codec/faad/decoder.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/codec/faad/decoder.c b/modules/codec/faad/decoder.c index 249a1f6478..fa8f332bc6 100644 --- a/modules/codec/faad/decoder.c +++ b/modules/codec/faad/decoder.c @@ -2,7 +2,7 @@ * decoder.c: AAC decoder using libfaad2 ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: decoder.c,v 1.26 2003/08/17 23:02:51 fenrir Exp $ + * $Id: decoder.c,v 1.27 2003/08/23 16:15:47 fenrir Exp $ * * Authors: Laurent Aimar * @@ -393,8 +393,8 @@ static void DecodeThread( adec_thread_t *p_adec ) /* **** First check if we have a valid output **** */ if( ( !p_adec->p_aout_input )|| - ( p_adec->output_format.i_original_channels != - pi_channels_maps[faad_frame.channels] ) ) + ( p_adec->output_format.i_original_channels != pi_channels_maps[faad_frame.channels] ) || + ( p_adec->output_format.i_rate != faad_frame.samplerate ) ) { if( p_adec->p_aout_input ) { @@ -406,6 +406,7 @@ static void DecodeThread( adec_thread_t *p_adec ) p_adec->output_format.i_physical_channels = p_adec->output_format.i_original_channels = pi_channels_maps[faad_frame.channels]; + p_adec->output_format.i_rate = faad_frame.samplerate; aout_DateInit( &p_adec->date, p_adec->output_format.i_rate ); p_adec->p_aout_input = aout_DecNew( p_adec->p_fifo, -- 2.20.1