[vlc-commits] demux:dash: fix getScaledTimeBySegmentNumber() returning an stime_t instead of vlc_tick_t

Steve Lhomme git at videolan.org
Tue Sep 18 13:53:18 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 11 15:20:31 2018 +0200| [8c640ae1c96bbf61abafd5436401f9c171b5c06c] | committer: Steve Lhomme

demux:dash: fix getScaledTimeBySegmentNumber() returning an stime_t instead of vlc_tick_t

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

 modules/demux/dash/mpd/Representation.cpp | 4 ++--
 modules/demux/dash/mpd/Representation.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/dash/mpd/Representation.cpp b/modules/demux/dash/mpd/Representation.cpp
index 3f0bdb9664..0080699dbc 100644
--- a/modules/demux/dash/mpd/Representation.cpp
+++ b/modules/demux/dash/mpd/Representation.cpp
@@ -101,9 +101,9 @@ std::string Representation::contextualize(size_t number, const std::string &comp
     return str;
 }
 
-vlc_tick_t Representation::getScaledTimeBySegmentNumber(uint64_t index, const MediaSegmentTemplate *templ) const
+stime_t Representation::getScaledTimeBySegmentNumber(uint64_t index, const MediaSegmentTemplate *templ) const
 {
-    vlc_tick_t time = 0;
+    stime_t time = 0;
     if(templ->segmentTimeline.Get())
     {
         time = templ->segmentTimeline.Get()->getScaledPlaybackTimeByElementNumber(index);
diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
index e57770dcf6..19e71c5dac 100644
--- a/modules/demux/dash/mpd/Representation.h
+++ b/modules/demux/dash/mpd/Representation.h
@@ -55,7 +55,7 @@ namespace dash
             private:
 
                 /* for contextualize() */
-                vlc_tick_t getScaledTimeBySegmentNumber(uint64_t, const MediaSegmentTemplate *) const;
+                stime_t getScaledTimeBySegmentNumber(uint64_t, const MediaSegmentTemplate *) const;
         };
     }
 }



More information about the vlc-commits mailing list