Revert "FIX: [MVC;SSIF] avoid being stuck"

This reverts commit 535b705876e31fd20e45c93c45b3a5d3e12bf74a.
popcornmix · Jan 17, 2016 · b2ca3a9 · b2ca3a9
1 parent 9cc8ad3
commit b2ca3a9
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -803,7 +803,6 @@ DemuxPacket* CDVDDemuxFFmpeg::GetMVCPacket()
   }
   else if (tsH264 > tsMVC)
   {
-    // H264 before MVC ?
 #if defined(DEBUG_VERBOSE)
     CLog::Log(LOGDEBUG, ">>> MVC missing mvc: %d, pts(%f) dts (%f)", h264pkt->iSize, h264pkt->pts, h264pkt->dts);
 #endif
@@ -820,12 +819,6 @@ DemuxPacket* CDVDDemuxFFmpeg::GetMVCPacket()
         m_MVCqueue.pop();
       }
     }
-    else if (!m_MVCqueue.empty())
-    {
-      // pop or we are stuck
-      CDVDDemuxUtils::FreeDemuxPacket(m_MVCqueue.front());
-      m_MVCqueue.pop();
-    }
     newpkt = CDVDDemuxUtils::AllocateDemuxPacket(0);
     newpkt->iSize = 0;
   }
@@ -836,16 +829,6 @@ DemuxPacket* CDVDDemuxFFmpeg::GetMVCPacket()
       CDVDDemuxUtils::FreeDemuxPacket(m_H264queue.front());
       m_H264queue.pop();
     }
-    else if (!m_H264queue.empty())
-    {
-      // missing an MVC packets
-#if defined(DEBUG_VERBOSE)
-      CLog::Log(LOGDEBUG, ">>> MVC missing mvc2: %d, pts(%f) dts (%f)", h264pkt->iSize, h264pkt->pts, h264pkt->dts);
-#endif
-      // pop or we are stuck
-      CDVDDemuxUtils::FreeDemuxPacket(m_H264queue.front());
-      m_H264queue.pop();
-    }
     newpkt = CDVDDemuxUtils::AllocateDemuxPacket(0);
     newpkt->iSize = 0;
   }