vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jun 7 10:39:09 2018 +0200| [d43d6a47a676f0946dffd3a9f902ab5ad0c97832] | committer: Steve Lhomme
demux:asf: i_play_duration/i_send_duration are msftime_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d43d6a47a676f0946dffd3a9f902ab5ad0c97832 --- modules/demux/asf/asf.c | 2 +- modules/demux/asf/libasf.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c index 24458457bb..fc992a316a 100644 --- a/modules/demux/asf/asf.c +++ b/modules/demux/asf/asf.c @@ -1247,7 +1247,7 @@ static int DemuxInit( demux_t *p_demux ) p_sys->p_fp->i_min_data_packet_size; /* calculate the time duration in micro-s */ - p_sys->i_length = (vlc_tick_t)p_sys->p_fp->i_play_duration / 10 * + p_sys->i_length = VLC_TICK_FROM_MSFTIME(p_sys->p_fp->i_play_duration) * (vlc_tick_t)i_count / (vlc_tick_t)p_sys->p_fp->i_data_packets_count - p_sys->p_fp->i_preroll * 1000; if( p_sys->i_length < 0 ) diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h index bec83df2dc..e35c21a0cf 100644 --- a/modules/demux/asf/libasf.h +++ b/modules/demux/asf/libasf.h @@ -104,8 +104,8 @@ typedef struct uint64_t i_file_size; uint64_t i_creation_date; uint64_t i_data_packets_count; - uint64_t i_play_duration; - uint64_t i_send_duration; + msftime_t i_play_duration; + msftime_t i_send_duration; uint64_t i_preroll; uint32_t i_flags; uint32_t i_min_data_packet_size; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
