Commit 01a24c0a authored by Rafaël Carré's avatar Rafaël Carré

Revert "ASF: Do not use stream_Read with a NULL buffer"

This reverts commit 77a7babe.
parent 77a7babe
...@@ -637,9 +637,8 @@ static int DemuxPacket( demux_t *p_demux ) ...@@ -637,9 +637,8 @@ static int DemuxPacket( demux_t *p_demux )
msg_Warn( p_demux, "Read %d too much bytes in the packet", msg_Warn( p_demux, "Read %d too much bytes in the packet",
i_packet_padding_length - i_packet_size_left ); i_packet_padding_length - i_packet_size_left );
#endif #endif
if( stream_Seek( p_demux->s, if( stream_Read( p_demux->s, NULL, i_packet_size_left )
stream_Tell( p_demux->s ) + i_packet_size_left ) < i_packet_size_left )
!= VLC_SUCCESS)
{ {
msg_Err( p_demux, "cannot skip data, EOF ?" ); msg_Err( p_demux, "cannot skip data, EOF ?" );
return 0; return 0;
......
...@@ -479,7 +479,7 @@ static int ASF_ReadObject_header_extension( stream_t *s, asf_object_t *p_obj ) ...@@ -479,7 +479,7 @@ static int ASF_ReadObject_header_extension( stream_t *s, asf_object_t *p_obj )
if( !p_he->i_header_extension_size ) return VLC_SUCCESS; if( !p_he->i_header_extension_size ) return VLC_SUCCESS;
/* Read the extension objects */ /* Read the extension objects */
stream_Seek( s, stream_Tell( s ) + 46 ); stream_Read( s, NULL, 46 );
for( ; ; ) for( ; ; )
{ {
asf_object_t *p_obj = malloc( sizeof( asf_object_t ) ); asf_object_t *p_obj = malloc( sizeof( asf_object_t ) );
......
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