vlc | branch: master | Francois Cartegnie <[email protected]> | Thu May 23 11:04:24 2019 +0200| [9c987897e59e8db652573abd0301163db4ec76e2] | committer: Francois Cartegnie
demux: adaptive: fix null deref 7ff23c447d942c4bd4f88bbcd680892d57643b9e copy paste regression > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9c987897e59e8db652573abd0301163db4ec76e2 --- modules/demux/adaptive/playlist/SegmentTemplate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/adaptive/playlist/SegmentTemplate.cpp b/modules/demux/adaptive/playlist/SegmentTemplate.cpp index d0aef9f33d..c20e5d1cc9 100644 --- a/modules/demux/adaptive/playlist/SegmentTemplate.cpp +++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp @@ -108,7 +108,7 @@ Timescale MediaSegmentTemplate::inheritTimescale() const ulevel->mediaSegmentTemplate->getTimescale().isValid() ) return ulevel->mediaSegmentTemplate->getTimescale(); if( ulevel->getTimescale().isValid() ) - return ulevel->mediaSegmentTemplate->getTimescale(); + return ulevel->getTimescale(); } return Timescale(1); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
