*****************************************************************************/
static int ReSynch( demux_t *p_demux )
{
- const uint8_t *p_peek;
- int i_skip;
- int i_peek;
-
- while( vlc_object_alive (p_demux) )
+ for( ;; )
{
- if( ( i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ) ) < 8 )
- {
- return VLC_EGENERIC;
- }
- i_skip = 0;
+ const uint8_t *p_peek;
+ int i_peek = stream_Peek( p_demux->s, &p_peek, 1024 );
+ if( i_peek < 8 )
+ break;
+
+ int i_skip = 0;
while( i_skip < i_peek - 5 )
{
if( p_peek[0] == 'A' && p_peek[1] == 'V' && p_peek[4] == 0x55 )
{
- if( i_skip > 0 )
- {
- stream_Read( p_demux->s, NULL, i_skip );
- }
+ if( i_skip > 0
+ && stream_Read( p_demux->s, NULL, i_skip ) < i_skip )
+ return VLC_EGENERIC;
return VLC_SUCCESS;
}
p_peek++;
i_skip++;
}
- stream_Read( p_demux->s, NULL, i_skip );
+ if( stream_Read( p_demux->s, NULL, i_skip ) < i_skip )
+ break;
}
return VLC_EGENERIC;