Skip to content

V
vlc-2-2
Commit b06d6287 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

libasf.c: clean up + maybe a bug fix.

parent eb75ac5f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/demux/asf/libasf.c
View file @ b06d6287
...@@ -888,6 +888,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s, ...@@ -888,6 +888,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
p_data += 16+2+4+i_size; p_data += 16+2+4+i_size;
} }
p_esp->p_sp = NULL;
if( p_data < &p_peek[i_peek] ) if( p_data < &p_peek[i_peek] )
{ {
asf_object_t *p_sp; asf_object_t *p_sp;
...@@ -948,10 +949,6 @@ static void ASF_FreeObject_extended_stream_properties( asf_object_t *p_obj) ...@@ -948,10 +949,6 @@ static void ASF_FreeObject_extended_stream_properties( asf_object_t *p_obj)
} }
guid_t type;
int16_t i_stream_number_count;
int16_t *pi_stream_number;
static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s, static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
asf_object_t *p_obj) asf_object_t *p_obj)
{ {
...@@ -1231,7 +1228,10 @@ static int ASF_ReadObject( stream_t *s, asf_object_t *p_obj, ...@@ -1231,7 +1228,10 @@ static int ASF_ReadObject( stream_t *s, asf_object_t *p_obj,
int i_result; int i_result;
int i_index; int i_index;
if( !p_obj ) return( 0 ); if( !p_obj )
return( 0 );
memset( p_obj, 0, sizeof( p_obj ) );
if( ASF_ReadObjectCommon( s, p_obj ) ) if( ASF_ReadObjectCommon( s, p_obj ) )
{ {
......
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