fixup after PR13295

popcornmix · Feb 5, 2018 · 19b4fae · 19b4fae
1 parent 76da985
commit 19b4fae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -518,7 +518,7 @@ bool CDVDDemuxFFmpeg::Open(std::shared_ptr<CDVDInputStream> pInput, bool streami
 
   if (!fileinfo)
   {
-    CDVDInputStream::IExtentionStream* pExt = dynamic_cast<CDVDInputStream::IExtentionStream*>(m_pInput);
+    const std::shared_ptr<CDVDInputStream::IExtentionStream> pExt = std::dynamic_pointer_cast<CDVDInputStream::IExtentionStream>(m_pInput);
     if (pExt && pExt->HasExtention())
     {
       SAFE_DELETE(m_pSSIF);
@@ -1581,7 +1581,7 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int streamIdx)
               pStream->codecpar->codec_tag = MKTAG('A', 'M', 'V', 'C');
 
               AVStream* mvcStream = nullptr;
-              CDVDInputStream::IExtentionStream* pExt = dynamic_cast<CDVDInputStream::IExtentionStream*>(m_pInput);
+              const std::shared_ptr<CDVDInputStream::IExtentionStream> pExt = std::dynamic_pointer_cast<CDVDInputStream::IExtentionStream>(m_pInput);
               if (pExt)
               {
                 if (pExt->HasExtention())

diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxStreamSSIF.h
@@ -41,15 +41,15 @@ class CDemuxStreamSSIF
   int GetH264StreamId() { return m_h264StreamId; };
   int GetMVCStreamId() { return m_mvcStreamId; };
   void AddMVCExtPacket(DemuxPacket* &scrPkt);
-  void SetBluRay(CDVDInputStream::IExtentionStream* &bluRay) { m_bluRay = bluRay; };
+  void SetBluRay(const std::shared_ptr<CDVDInputStream::IExtentionStream> &bluRay) { m_bluRay = bluRay; };
   bool IsBluRay() { return m_bluRay != nullptr; };
 
 private:
   DemuxPacket* GetMVCPacket();
   DemuxPacket* MergePacket(DemuxPacket* &srcPkt, DemuxPacket* &appendPkt);
   bool FillMVCQueue(double dtsBase);
 
-  CDVDInputStream::IExtentionStream* m_bluRay = nullptr;
+  std::shared_ptr<CDVDInputStream::IExtentionStream> m_bluRay = nullptr;
   std::queue<DemuxPacket*> m_H264queue;
   std::queue<DemuxPacket*> m_MVCqueue;
   int m_h264StreamId = -1;

diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -3743,7 +3743,7 @@ bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
     if (!player->OpenStream(hint))
       return false;
 
-    CDVDInputStream::IExtentionStream* pExt = dynamic_cast<CDVDInputStream::IExtentionStream*>(m_pInputStream);
+    const std::shared_ptr<CDVDInputStream::IExtentionStream>  pExt = std::dynamic_pointer_cast<CDVDInputStream::IExtentionStream>(m_pInputStream);
     if (pExt && !static_cast<IDVDStreamPlayerVideo*>(player)->SupportsExtention())
       pExt->DisableExtention();