Commit 6e4e3d65 authored by Stephan Assmus's avatar Stephan Assmus

compile fix, do not declare variables in the middle of a function, this is plain C...

parent cdb1e120
...@@ -101,6 +101,8 @@ static int Activate( vlc_object_t * p_this ) ...@@ -101,6 +101,8 @@ static int Activate( vlc_object_t * p_this )
{ {
demux_t *p_demux = (demux_t *)p_this; demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys; demux_sys_t *p_sys;
byte_t *p_peek;
int i_size;
p_demux->pf_demux = Demux; p_demux->pf_demux = Demux;
p_demux->pf_control = Control; p_demux->pf_control = Control;
...@@ -116,8 +118,7 @@ static int Activate( vlc_object_t * p_this ) ...@@ -116,8 +118,7 @@ static int Activate( vlc_object_t * p_this )
/* Lets check the content to see if this is a sgi mediabase file */ /* Lets check the content to see if this is a sgi mediabase file */
byte_t *p_peek; i_size = stream_Peek( p_demux->s, &p_peek, MAX_LINE );
int i_size = stream_Peek( p_demux->s, &p_peek, MAX_LINE );
i_size -= sizeof("sgiNameServerHost=") - 1; i_size -= sizeof("sgiNameServerHost=") - 1;
if ( i_size > 0 ) { if ( i_size > 0 ) {
while ( i_size while ( i_size
......
...@@ -491,6 +491,7 @@ static void SkipItem( playlist_t *p_playlist, int i_arg ) ...@@ -491,6 +491,7 @@ static void SkipItem( playlist_t *p_playlist, int i_arg )
int i_oldindex = p_playlist->i_index; int i_oldindex = p_playlist->i_index;
vlc_bool_t b_random, b_repeat, b_loop; vlc_bool_t b_random, b_repeat, b_loop;
vlc_value_t val; vlc_value_t val;
int i_count;
/* If the playlist is empty, there is no current item */ /* If the playlist is empty, there is no current item */
if( p_playlist->i_size == 0 ) if( p_playlist->i_size == 0 )
...@@ -510,7 +511,7 @@ static void SkipItem( playlist_t *p_playlist, int i_arg ) ...@@ -510,7 +511,7 @@ static void SkipItem( playlist_t *p_playlist, int i_arg )
if( b_random ) if( b_random )
{ {
srand( (unsigned int)mdate() ); srand( (unsigned int)mdate() );
int i_count = 0; i_count = 0;
while( i_count < p_playlist->i_size ) while( i_count < p_playlist->i_size )
{ {
p_playlist->i_index = p_playlist->i_index =
......
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