[vlc-commits] video_output: the "video-title-timeout" is in milliseconds

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jul  6 11:59:12 2018 +0200| [7a0b3166809231856ca7a1a1005ca48e9df98e33] | committer: Steve Lhomme

video_output: the "video-title-timeout" is in milliseconds

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

 src/video_output/video_output.c  | 2 +-
 src/video_output/vout_internal.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index bd10014314..bfa76856f0 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1254,7 +1254,7 @@ static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string)
         return;
 
     vout_OSDText(vout, VOUT_SPU_CHANNEL_OSD,
-                 vout->p->title.position, INT64_C(1000) * vout->p->title.timeout,
+                 vout->p->title.position, VLC_TICK_FROM_MS(vout->p->title.timeout),
                  string);
 }
 
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 86c7cc5b24..b6940ba070 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -114,7 +114,7 @@ struct vout_thread_sys_t
     /* OSD title configuration */
     struct {
         bool        show;
-        vlc_tick_t  timeout;
+        int         timeout;
         int         position;
     } title;