Commit 7076fe3a authored by Rafaël Carré's avatar Rafaël Carré

Revert "stream_Read() : makes the buffer mandatory"

This reverts commit 0bcda15e.
parent b1285bea
...@@ -804,10 +804,13 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ) ...@@ -804,10 +804,13 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read )
int i_copy = __MIN( i_current, i_read - i_data); int i_copy = __MIN( i_current, i_read - i_data);
/* Copy data */ /* Copy data */
memcpy( p_data, if( p_data )
{
memcpy( p_data,
&p_sys->block.p_current->p_buffer[p_sys->block.i_offset], &p_sys->block.p_current->p_buffer[p_sys->block.i_offset],
i_copy ); i_copy );
p_data += i_copy; p_data += i_copy;
}
i_data += i_copy; i_data += i_copy;
p_sys->block.i_offset += i_copy; p_sys->block.i_offset += i_copy;
...@@ -1145,8 +1148,11 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) ...@@ -1145,8 +1148,11 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read )
/* Copy data */ /* Copy data */
/* msg_Dbg( s, "AStreamReadStream: copy %d", i_copy ); */ /* msg_Dbg( s, "AStreamReadStream: copy %d", i_copy ); */
memcpy( p_data, &tk->p_buffer[i_off], i_copy ); if( p_data )
p_data += i_copy; {
memcpy( p_data, &tk->p_buffer[i_off], i_copy );
p_data += i_copy;
}
i_data += i_copy; i_data += i_copy;
p_sys->stream.i_offset += i_copy; p_sys->stream.i_offset += i_copy;
...@@ -2068,8 +2074,6 @@ static int ASeek( stream_t *s, int64_t i_pos ) ...@@ -2068,8 +2074,6 @@ static int ASeek( stream_t *s, int64_t i_pos )
*/ */
int stream_Read( stream_t *s, void *p_read, int i_read ) int stream_Read( stream_t *s, void *p_read, int i_read )
{ {
assert( s );
assert( p_read );
return s->pf_read( s, p_read, i_read ); return s->pf_read( s, p_read, i_read );
} }
......
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