[SCM] kodi-pvr-hts/master: demuxer: do not call flush when skip failed

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Fri Nov 4 23:23:34 UTC 2016


The following commit has been merged in the master branch:
commit 7449ad39f4e62db354d261fc9c24f9ebfd11dfbc
Author: Jaroslav Kysela <perex at perex.cz>
Date:   Sun Jan 3 13:56:36 2016 +0100

    demuxer: do not call flush when skip failed

diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
index c4f2205..65226c3 100644
--- a/src/HTSPDemuxer.cpp
+++ b/src/HTSPDemuxer.cpp
@@ -527,8 +527,8 @@ void CHTSPDemuxer::ParseSubscriptionSkip ( htsmsg_t *m )
     m_seekTime = INVALID_SEEKTIME;
   } else {
     m_seekTime = s64 < 0 ? 1 : s64 + 1; /* it must not be zero! */
+    Flush(); /* flush old packets (with wrong pts) */
   }
-  Flush(); /* flush old packets (with wrong pts) */
   m_seeking = false;
   m_seekCond.Broadcast();
 }

-- 
kodi-pvr-hts packaging



More information about the pkg-multimedia-commits mailing list