[vlc-commits] libvlc: use US_FROM_VLC_TICK for values returned in microseconds
Steve Lhomme
git at videolan.org
Fri Jul 6 16:07:13 CEST 2018
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jun 14 10:07:48 2018 +0200| [df129d18416485fee31eda9c9f4bf4bd6af605b4] | committer: Steve Lhomme
libvlc: use US_FROM_VLC_TICK for values returned in microseconds
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=df129d18416485fee31eda9c9f4bf4bd6af605b4
---
lib/core.c | 2 +-
lib/vlm.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/core.c b/lib/core.c
index 9b3c9c0245..d777f695ce 100644
--- a/lib/core.c
+++ b/lib/core.c
@@ -238,7 +238,7 @@ libvlc_module_description_t *libvlc_video_filter_list_get( libvlc_instance_t *p_
int64_t libvlc_clock(void)
{
- return vlc_tick_now();
+ return US_FROM_VLC_TICK(vlc_tick_now());
}
const char vlc_module_name[] = "libvlc";
diff --git a/lib/vlm.c b/lib/vlm.c
index 1f66058efa..0e32bccdc7 100644
--- a/lib/vlm.c
+++ b/lib/vlm.c
@@ -660,7 +660,7 @@ int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_instance,
p_mi = libvlc_vlm_get_media_instance( p_instance, psz_name, i_instance );
if( p_mi )
{
- result = p_mi->i_time;
+ result = US_FROM_VLC_TICK(p_mi->i_time);
vlm_media_instance_Delete( p_mi );
}
return result;
@@ -676,7 +676,7 @@ int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_instance,
p_mi = libvlc_vlm_get_media_instance( p_instance, psz_name, i_instance );
if( p_mi )
{
- result = p_mi->i_length;
+ result = US_FROM_VLC_TICK(p_mi->i_length);
vlm_media_instance_Delete( p_mi );
}
return result;
More information about the vlc-commits
mailing list