vlc | branch: master | Steve Lhomme <[email protected]> | Fri Jun 8 12:45:36 2018 +0200| [52f365152813cf692956ba37ff700ef3c5c7e1a5] | committer: Steve Lhomme
demux:mp4: i_nztime is an vlc_tick_t as the comment suggests > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=52f365152813cf692956ba37ff700ef3c5c7e1a5 --- modules/demux/mp4/mp4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index d76328ffc7..39f8ad2a94 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -98,7 +98,7 @@ typedef struct uint64_t i_duration; /* Declared fragmented duration (movie time scale) */ uint64_t i_cumulated_duration; /* Same as above, but not from probing, (movie time scale) */ uint32_t i_timescale; /* movie time scale */ - uint64_t i_nztime; /* time position of the presentation (CLOCK_FREQ timescale) */ + vlc_tick_t i_nztime; /* time position of the presentation (CLOCK_FREQ timescale) */ unsigned int i_tracks; /* number of tracks */ mp4_track_t *track; /* array of track */ float f_fps; /* number of frame per seconds */ @@ -436,7 +436,7 @@ static inline vlc_tick_t MP4_GetSamplesDuration( demux_t *p_demux, mp4_track_t * return MP4_rescale( i_duration, p_track->i_timescale, CLOCK_FREQ ); } -static inline int64_t MP4_GetMoviePTS(demux_sys_t *p_sys ) +static inline vlc_tick_t MP4_GetMoviePTS(demux_sys_t *p_sys ) { return p_sys->i_nztime; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
