[vlc-commits] demux: adaptive: fix null deref

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu May 23 11:04:24 2019 +0200| [a01b31dc863e54bb2abb8be4daaf149c5458e51c] | committer: Francois Cartegnie

demux: adaptive: fix null deref

7ff23c447d942c4bd4f88bbcd680892d57643b9e copy paste regression

(cherry picked from commit 9c987897e59e8db652573abd0301163db4ec76e2)

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

 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 4b5cdffdd9..e9c657e644 100644
--- a/modules/demux/adaptive/playlist/SegmentTemplate.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
@@ -109,7 +109,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);
 }