* all: cast of lvalues ...

modules/demux/wav.c

@@ -2,7 +2,7 @@
  * wav.c : wav file input module for vlc
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: wav.c,v 1.15 2004/03/03 11:40:19 fenrir Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -119,7 +119,8 @@ static int Open( vlc_object_t * p_this )
     stream_Read( p_demux->s, NULL, 8 );   /* Cannot fail */
 
     /* load waveformatex */
-    p_wf = (WAVEFORMATEX *)p_wf_ext = malloc( __EVEN( i_size ) + 2 );
+    p_wf_ext = malloc( __EVEN( i_size ) + 2 );
+    p_wf = (WAVEFORMATEX *)p_wf_ext;
     p_wf->cbSize = 0;
     if( stream_Read( p_demux->s,
                      p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) )

modules/mux/mpeg/ps.c

@@ -189,7 +189,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
 
     msg_Dbg( p_mux, "adding input codec=%4.4s", (char*)&p_input->p_fmt->i_codec );
 
-    p_input->p_sys = (void*)p_stream = malloc( sizeof( ps_stream_t ) );
+    p_input->p_sys = p_stream = malloc( sizeof( ps_stream_t ) );
 
     /* Init this new stream */
     switch( p_input->p_fmt->i_codec )

modules/mux/mpeg/ts.c

@@ -472,7 +472,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     sout_mux_sys_t      *p_sys = p_mux->p_sys;
     ts_stream_t         *p_stream;
 
-    p_input->p_sys = (void*)p_stream = malloc( sizeof( ts_stream_t ) );
+    p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) );
 
     /* Init this new stream */
     p_stream->i_pid = AllocatePID( p_sys, p_input->p_fmt->i_cat );