vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Sep 18 15:17:55 2014 +0200| [5e4b6380fc0468acde12957eb7aa4b9784874565] | committer: Francois Cartegnie
demux: avi: simplify dpts code > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5e4b6380fc0468acde12957eb7aa4b9784874565 --- modules/demux/avi/avi.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index 2b12223..b04e966 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -1006,7 +1006,6 @@ static int Demux_Seekable( demux_t *p_demux ) for( i_track = 0; i_track < p_sys->i_track; i_track++ ) { avi_track_t *tk = p_sys->track[i_track]; - mtime_t i_dpts; toread[i_track].b_ok = tk->b_activated && !tk->b_eof; if( tk->i_idxposc < tk->idx.i_size ) @@ -1022,20 +1021,15 @@ static int Demux_Seekable( demux_t *p_demux ) toread[i_track].i_posf = -1; } - i_dpts = p_sys->i_time - AVI_GetPTS( tk ); + mtime_t i_dpts = p_sys->i_time - AVI_GetPTS( tk ); if( tk->i_samplesize ) { - toread[i_track].i_toread = AVI_PTSToByte( tk, llabs( i_dpts ) ); + toread[i_track].i_toread = AVI_PTSToByte( tk, i_dpts ); } else { - toread[i_track].i_toread = AVI_PTSToChunk( tk, llabs( i_dpts ) ); - } - - if( i_dpts < 0 ) - { - toread[i_track].i_toread *= -1; + toread[i_track].i_toread = AVI_PTSToChunk( tk, i_dpts ); } } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
