Skip to content

V
vlc-1.1
Commit 06454cdd authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

Fix an issue with AStreamRefillStream and mp4 indexes

parent 1752e105
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
src/input/stream.c
View file @ 06454cdd
...@@ -879,7 +879,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) ...@@ -879,7 +879,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos )
} }
else else
{ {
/* Read enought data */ /* Read enough data */
while( p_sys->block.i_start + p_sys->block.i_size < i_pos ) while( p_sys->block.i_start + p_sys->block.i_size < i_pos )
{ {
if( AStreamRefillBlock( s ) ) if( AStreamRefillBlock( s ) )
...@@ -1119,7 +1119,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) ...@@ -1119,7 +1119,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos )
#ifdef STREAM_DEBUG #ifdef STREAM_DEBUG
msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd
"tk=%d start="I64Fd" offset=%d end="I64Fd, " tk=%d start="I64Fd" offset=%d end="I64Fd,
i_pos, p_sys->i_pos, p_sys->stream.i_tk, i_pos, p_sys->i_pos, p_sys->stream.i_tk,
p_sys->stream.tk[p_sys->stream.i_tk].i_start, p_sys->stream.tk[p_sys->stream.i_tk].i_start,
p_sys->stream.i_offset, p_sys->stream.i_offset,
...@@ -1149,8 +1149,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) ...@@ -1149,8 +1149,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos )
if( p_sys->stream.i_used < STREAM_READ_ATONCE / 2 ) if( p_sys->stream.i_used < STREAM_READ_ATONCE / 2 )
{ {
p_sys->stream.i_used = STREAM_READ_ATONCE / 2 ; p_sys->stream.i_used = STREAM_READ_ATONCE / 2 ;
if( AStreamRefillStream( s ) ) AStreamRefillStream( s );
return VLC_EGENERIC;
} }
} }
return VLC_SUCCESS; return VLC_SUCCESS;
......
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