[vlc-commits] demux:adaptive: don't write stime_t in local vlc_tick_t variables
Steve Lhomme
git at videolan.org
Fri Jul 6 09:20:46 CEST 2018
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 11 14:17:23 2018 +0200| [4e0fa87eeb111bc5a2f4df0518b6d8b0416c5a8a] | committer: Steve Lhomme
demux:adaptive: don't write stime_t in local vlc_tick_t variables
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4e0fa87eeb111bc5a2f4df0518b6d8b0416c5a8a
---
modules/demux/adaptive/playlist/SegmentInformation.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
index 160354117d..223b86c0a3 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -349,8 +349,8 @@ bool SegmentInformation::getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret)
SegmentTimeline *timeline = mediaSegmentTemplate->segmentTimeline.Get();
if(timeline)
{
- time = timescale.ToScaled(time);
- *ret = timeline->getElementNumberByScaledPlaybackTime(time);
+ stime_t st = timescale.ToScaled(time);
+ *ret = timeline->getElementNumberByScaledPlaybackTime(st);
return true;
}
@@ -372,16 +372,16 @@ bool SegmentInformation::getSegmentNumberByTime(vlc_tick_t time, uint64_t *ret)
else if ( segmentList && !segmentList->getSegments().empty() )
{
const Timescale timescale = segmentList->inheritTimescale();
- time = timescale.ToScaled(time);
- return segmentList->getSegmentNumberByScaledTime(time, ret);
+ stime_t st = timescale.ToScaled(time);
+ return segmentList->getSegmentNumberByScaledTime(st, ret);
}
else if( segmentBase )
{
const Timescale timescale = inheritTimescale();
- time = timescale.ToScaled(time);
+ stime_t st = timescale.ToScaled(time);
*ret = 0;
const std::vector<ISegment *> list = segmentBase->subSegments();
- return SegmentInfoCommon::getSegmentNumberByScaledTime(list, time, ret);
+ return SegmentInfoCommon::getSegmentNumberByScaledTime(list, st, ret);
}
if(parent)
More information about the vlc-commits
mailing list