vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Fri Jul  6 11:56:34 
2018 +0200| [4363eac23103a1077c76fc1632b9504f45022164] | committer: Steve Lhomme

core: "clock-jitter" is in milliseconds

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4363eac23103a1077c76fc1632b9504f45022164
---

 src/input/es_out.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 57ba48a08e..490fd3840f 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2518,7 +2518,8 @@ static int EsOutControlLocked( es_out_t *out, int 
i_query, va_list args )
                 vlc_tick_t i_pts_delay = input_clock_GetJitter( 
p_pgrm->p_input_clock );
 
                 /* Avoid dangerously high value */
-                const vlc_tick_t i_jitter_max = INT64_C(1000) * 
var_InheritInteger( p_sys->p_input, "clock-jitter" );
+                const vlc_tick_t i_jitter_max =
+                        VLC_TICK_FROM_MS(var_InheritInteger( p_sys->p_input, 
"clock-jitter" ));
                 if( i_pts_delay > __MIN( i_pts_delay_base + i_jitter_max, 
INPUT_PTS_DELAY_MAX ) )
                 {
                     es_out_pgrm_t *pgrm;

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to