vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jun 7 10:37:21 2018 +0200| [455671d504baf6429e692c9199a43b92ae0e6e36] | committer: Steve Lhomme
demux:asf: i_index_entry_time_interval is an msftime_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=455671d504baf6429e692c9199a43b92ae0e6e36 --- modules/demux/asf/asf.c | 2 +- modules/demux/asf/libasf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c index 2e7e9f2e07..24458457bb 100644 --- a/modules/demux/asf/asf.c +++ b/modules/demux/asf/asf.c @@ -366,7 +366,7 @@ static int SeekIndex( demux_t *p_demux, vlc_tick_t i_date, float f_pos ) p_index = ASF_FindObject( p_sys->p_root, &asf_object_simple_index_guid, 0 ); - uint64_t i_entry = p_sys->i_preroll_start * 10 / p_index->i_index_entry_time_interval; + uint64_t i_entry = MSFTIME_FROM_VLC_TICK(p_sys->i_preroll_start) / p_index->i_index_entry_time_interval; if( i_entry >= p_index->i_index_entry_count ) { msg_Warn( p_demux, "Incomplete index" ); diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h index 9404b06086..bec83df2dc 100644 --- a/modules/demux/asf/libasf.h +++ b/modules/demux/asf/libasf.h @@ -82,7 +82,7 @@ typedef struct { ASF_OBJECT_COMMON guid_t i_file_id; - uint64_t i_index_entry_time_interval; + msftime_t i_index_entry_time_interval; uint32_t i_max_packet_count; uint32_t i_index_entry_count; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
