Skip to content

V
vlc-2-2
Commit 024d9217 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

Fix the condition for old faad. 

Incorrect placing of logical operator
parent cb1976ed
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/codec/faad/decoder.c
View file @ 024d9217
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* decoder.c: AAC decoder using libfaad2 * decoder.c: AAC decoder using libfaad2
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: decoder.c,v 1.30 2003/09/02 20:19:25 gbazin Exp $ * $Id: decoder.c,v 1.31 2003/09/09 12:36:24 hartman Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -394,9 +394,9 @@ static void DecodeThread( adec_thread_t *p_adec ) ...@@ -394,9 +394,9 @@ static void DecodeThread( adec_thread_t *p_adec )
/* **** First check if we have a valid output **** */ /* **** First check if we have a valid output **** */
if( !p_adec->p_aout_input || if( !p_adec->p_aout_input ||
p_adec->output_format.i_original_channels p_adec->output_format.i_original_channels
!= pi_channels_maps[faad_frame.channels] || != pi_channels_maps[faad_frame.channels]
#ifndef HAVE_OLD_FAAD2 #ifndef HAVE_OLD_FAAD2
( faad_frame.samplerate && || ( faad_frame.samplerate &&
p_adec->output_format.i_rate != faad_frame.samplerate ) p_adec->output_format.i_rate != faad_frame.samplerate )
#endif #endif
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment