Commit 62dc2df2 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf

demux: avi:fix block reading

(cherry picked from commit d4c5f2dcd6a2df117b18422e2c50691e48be9707)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 55b88a40
...@@ -1027,7 +1027,7 @@ static int Demux_Seekable( demux_t *p_demux ) ...@@ -1027,7 +1027,7 @@ static int Demux_Seekable( demux_t *p_demux )
{ {
toread[i_track].i_toread = AVI_PTSToByte( tk, llabs( i_dpts ) ); toread[i_track].i_toread = AVI_PTSToByte( tk, llabs( i_dpts ) );
} }
else else if ( i_dpts > -2 * CLOCK_FREQ ) /* don't send a too early dts (low fps video) */
{ {
toread[i_track].i_toread = AVI_PTSToChunk( tk, llabs( i_dpts ) ); toread[i_track].i_toread = AVI_PTSToChunk( tk, llabs( i_dpts ) );
} }
...@@ -1036,6 +1036,8 @@ static int Demux_Seekable( demux_t *p_demux ) ...@@ -1036,6 +1036,8 @@ static int Demux_Seekable( demux_t *p_demux )
{ {
toread[i_track].i_toread *= -1; toread[i_track].i_toread *= -1;
} }
else
toread[i_track].i_toread = -1;
} }
for( ;; ) for( ;; )
...@@ -1057,7 +1059,7 @@ static int Demux_Seekable( demux_t *p_demux ) ...@@ -1057,7 +1059,7 @@ static int Demux_Seekable( demux_t *p_demux )
continue; continue;
} }
if( toread[i].i_toread > 0 ) if( toread[i].i_toread >= 0 )
{ {
b_done = false; /* not yet finished */ b_done = false; /* not yet finished */
} }
......
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