fixed another possible crash

[vlc] / modules / codec / araw.c

diff --git a/modules/codec/araw.c b/modules/codec/araw.c
index c5cd13be455bf4e20cab3afc9f4d9b38ed7fa29e..f0b886fb529cff6834b47a3cb8b87eee62a59d83 100644 (file)
--- a/modules/codec/araw.c
+++ b/modules/codec/araw.c
@@ -2,7 +2,7 @@
  * araw.c: Pseudo audio decoder; for raw pcm data
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: araw.c,v 1.9 2002/12/30 17:28:31 gbazin Exp $
+ * $Id: araw.c,v 1.11 2003/01/07 21:49:01 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *      
@@ -193,13 +193,12 @@ static void GetWaveFormatEx( waveformatex_t *p_wh,
 
 static int InitThread( adec_thread_t * p_adec )
 {
-
-    if( !p_adec->p_fifo->p_demux_data )
+    if( ( p_adec->p_wf = (WAVEFORMATEX*)p_adec->p_fifo->p_waveformatex ) == NULL )
     {
         msg_Err( p_adec->p_fifo, "unknown raw format" );
         return( -1 );
     }
-    p_adec->p_wf = (WAVEFORMATEX*)p_adec->p_fifo->p_demux_data;
+
     /* fixing some values */
     if( p_adec->p_wf->wFormatTag  == WAVE_FORMAT_PCM && 
         !p_adec->p_wf->nBlockAlign )
@@ -247,8 +246,6 @@ static int InitThread( adec_thread_t * p_adec )
     p_adec->output_format.i_physical_channels = 
             p_adec->output_format.i_original_channels =
             pi_channels_maps[p_adec->p_wf->nChannels];
-    p_adec->output_format.i_bytes_per_frame = p_adec->p_wf->nBlockAlign;
-    p_adec->output_format.i_frame_length = 1;
     p_adec->p_aout = NULL;
     p_adec->p_aout_input = NULL;