vlc | branch: master | Hugo Beauzée-Luyssen <h...@beauzee.fr> | Thu Oct 12 16:10:32 2017 +0200| [92ab073fc37225a1d31e9a4375d4c20415d9dc74] | committer: Hugo Beauzée-Luyssen
adaptive: Don't use qualified name lookup on unscoped enumerations > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=92ab073fc37225a1d31e9a4375d4c20415d9dc74 --- modules/demux/adaptive/playlist/SegmentInformation.cpp | 2 +- modules/demux/hls/playlist/Representation.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp index e8bdb752f2..8d5a7fe3ae 100644 --- a/modules/demux/adaptive/playlist/SegmentInformation.cpp +++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp @@ -422,7 +422,7 @@ bool SegmentInformation::getPlaybackTimeDurationBySegmentNumber(uint64_t number, else { const Timescale timescale = inheritTimescale(); - const ISegment *segment = getSegment(SegmentInfoType::INFOTYPE_MEDIA, number); + const ISegment *segment = getSegment(INFOTYPE_MEDIA, number); if( segment ) { *time = timescale.ToTime(segment->startTime.Get()); diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/Representation.cpp index f1d64dbd09..f920acc631 100644 --- a/modules/demux/hls/playlist/Representation.cpp +++ b/modules/demux/hls/playlist/Representation.cpp @@ -160,7 +160,7 @@ uint64_t Representation::translateSegmentNumber(uint64_t num, const SegmentInfor { if(consistentSegmentNumber()) return num; - ISegment *fromSeg = from->getSegment(SegmentInfoType::INFOTYPE_MEDIA, num); + ISegment *fromSeg = from->getSegment(INFOTYPE_MEDIA, num); HLSSegment *fromHlsSeg = dynamic_cast<HLSSegment *>(fromSeg); if(!fromHlsSeg) return 1; @@ -168,7 +168,7 @@ uint64_t Representation::translateSegmentNumber(uint64_t num, const SegmentInfor std::vector<ISegment *> list; std::vector<ISegment *>::const_iterator it; - getSegments(SegmentInfoType::INFOTYPE_MEDIA, list); + getSegments(INFOTYPE_MEDIA, list); for(it=list.begin(); it != list.end(); ++it) { const HLSSegment *hlsSeg = dynamic_cast<HLSSegment *>(*it); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits