vlc | branch: master | Steve Lhomme <[email protected]> | Tue Jun 12 13:07:35 2018 +0200| [8914a473e3d7cbc07e830d1249560619fd11ad5c] | committer: Steve Lhomme
mux:mp4: the difference of mtime_t is an mtime_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8914a473e3d7cbc07e830d1249560619fd11ad5c --- modules/mux/mp4/mp4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mux/mp4/mp4.c b/modules/mux/mp4/mp4.c index 754519af53..3f29c31d61 100644 --- a/modules/mux/mp4/mp4.c +++ b/modules/mux/mp4/mp4.c @@ -675,7 +675,7 @@ static int MuxStream(sout_mux_t *p_mux, sout_input_t *p_input, mp4_stream_t *p_s } else { - int64_t i_diff = dts_fb_pts( p_next ) - dts_fb_pts( p_data ); + mtime_t i_diff = dts_fb_pts( p_next ) - dts_fb_pts( p_data ); if (i_diff < CLOCK_FREQ) /* protection */ p_data->i_length = i_diff; } @@ -1071,7 +1071,7 @@ static bo_t *GetMoofBox(sout_mux_t *p_mux, size_t *pi_mdat_total_size, if (i_trun_flags & MP4_TRUN_SAMPLE_TIME_OFFSET) { - uint32_t i_diff = 0; + mtime_t i_diff = 0; if ( p_entry->p_block->i_dts != VLC_TS_INVALID && p_entry->p_block->i_pts > p_entry->p_block->i_dts ) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
