vlc | branch: master | Steve Lhomme <[email protected]> | Tue Jun 12 14:55:33 2018 +0200| [67cca7dda0a708eb08ff1de42a20c1b0feb4fd09] | committer: Steve Lhomme
mux:ps/ts: "dts-delay" is in milliseconds used in an vlc_tick_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=67cca7dda0a708eb08ff1de42a20c1b0feb4fd09 --- modules/mux/mpeg/ps.c | 2 +- modules/mux/mpeg/ts.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c index 8db448bc17..12eaff53f0 100644 --- a/modules/mux/mpeg/ps.c +++ b/modules/mux/mpeg/ps.c @@ -180,7 +180,7 @@ static int Open( vlc_object_t *p_this ) p_sys->b_mpeg2 = !(p_mux->psz_mux && !strcmp( p_mux->psz_mux, "mpeg1" )); var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val ); - p_sys->i_dts_delay = (int64_t)val.i_int * 1000; + p_sys->i_dts_delay = VLC_TICK_FROM_MS(val.i_int); var_Get( p_mux, SOUT_CFG_PREFIX "pes-max-size", &val ); p_sys->i_pes_max_size = (int64_t)val.i_int; diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 465737ac8c..2fa61588c4 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -728,7 +728,7 @@ static int Open( vlc_object_t *p_this ) } var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val ); - p_sys->i_dts_delay = val.i_int * 1000; + p_sys->i_dts_delay = VLC_TICK_FROM_MS(val.i_int); msg_Dbg( p_mux, "shaping=%"PRId64" pcr=%"PRId64" dts_delay=%"PRId64, p_sys->i_shaping_delay, p_sys->i_pcr_delay, p_sys->i_dts_delay ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
