vlc | branch: master | Steve Lhomme <[email protected]> | Fri Jun 8 15:30:33 2018 +0200| [f2be7ebbed9b475e91ca3bfe842fb8a451f016ed] | committer: Steve Lhomme
demux:mp4: separate stime_t & vlc_tick_t duration in MP4_GetInterleaving() Thus max_continuity is effectively an vlc_tick_t which compares correctly to DEMUX_TRACK_MAX_PRELOAD > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f2be7ebbed9b475e91ca3bfe842fb8a451f016ed --- modules/demux/mp4/mp4.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 51dd4bd5ce..a67c487236 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -548,7 +548,7 @@ static uint32_t MP4_TrackGetRunSeq( mp4_track_t *p_track ) /* Analyzes chunks to find max interleave length * sets flat flag if no interleaving is in use */ -static void MP4_GetInterleaving( demux_t *p_demux, uint64_t *pi_max_contiguous, bool *pb_flat ) +static void MP4_GetInterleaving( demux_t *p_demux, vlc_tick_t *pi_max_contiguous, bool *pb_flat ) { demux_sys_t *p_sys = p_demux->p_sys; *pi_max_contiguous = 0; @@ -592,9 +592,9 @@ static void MP4_GetInterleaving( demux_t *p_demux, uint64_t *pi_max_contiguous, if( tk != nexttk ) { - i_duration = MP4_rescale( i_duration, tk->i_timescale, CLOCK_FREQ ); - if( i_duration > *pi_max_contiguous ) - *pi_max_contiguous = i_duration; + vlc_tick_t i_dur = MP4_rescale( i_duration, tk->i_timescale, CLOCK_FREQ ); + if( i_dur > *pi_max_contiguous ) + *pi_max_contiguous = i_dur; i_duration = 0; if( tk->i_chunk != tk->i_chunk_count ) @@ -1075,7 +1075,7 @@ static int Open( vlc_object_t * p_this ) if( p_sys->i_tracks > 1 && !p_sys->b_fastseekable ) { - uint64_t i_max_continuity; + vlc_tick_t i_max_continuity; bool b_flat; MP4_GetInterleaving( p_demux, &i_max_continuity, &b_flat ); if( b_flat ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
