[vlc-commits] demux: adaptive: fix regression with non zero starting content

Francois Cartegnie git at videolan.org
Mon Dec 14 10:41:37 UTC 2020


vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Oct  8 12:41:46 2020 +0200| [bfadf89d5d51b536f8337edc68ff8b38447ed876] | committer: Francois Cartegnie

demux: adaptive: fix regression with non zero starting content

regression by 15f5497b25797f3d190598a0f523ad6031cb7cd1

(cherry picked from commit 694c5b02e9c996353e20dc494ab49c6e8a81a60e)

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

 modules/demux/adaptive/plumbing/CommandsQueue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/plumbing/CommandsQueue.cpp b/modules/demux/adaptive/plumbing/CommandsQueue.cpp
index 7cc9feaeae..1f66972f56 100644
--- a/modules/demux/adaptive/plumbing/CommandsQueue.cpp
+++ b/modules/demux/adaptive/plumbing/CommandsQueue.cpp
@@ -434,7 +434,7 @@ bool CommandsQueue::isEOF() const
 
 mtime_t CommandsQueue::getDemuxedAmount(mtime_t from) const
 {
-    if( from > bufferinglevel || from < getFirstDTS() )
+    if( from > bufferinglevel )
         return 0;
     if( from > getFirstDTS() )
         return bufferinglevel - from;



More information about the vlc-commits mailing list