[vlc-commits] Revert "demux: adaptive: fix download from each adaptation set"

Francois Cartegnie git at videolan.org
Fri Nov 3 17:46:49 CET 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Nov  3 16:27:52 2017 +0100| [e244d8b10d987c9f8b4e2e4ae7af9355dd580949] | committer: Francois Cartegnie

Revert "demux: adaptive: fix download from each adaptation set"

Broke stream reselection/alternative streams
(->input goes End(), mode goes None, so ES can never be reselected in es_out).

need to find a different fix.

This reverts commit bced5fe7a56bb8373be9100c3bf78bab179d3e06.

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

 modules/demux/adaptive/Streams.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/demux/adaptive/Streams.cpp b/modules/demux/adaptive/Streams.cpp
index 4b143a1d3c..baef7e4534 100644
--- a/modules/demux/adaptive/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -266,10 +266,6 @@ void AbstractStream::setDisabled(bool b)
 {
     if(disabled != b)
         segmentTracker->notifyBufferingState(!b);
-     /* Ensures unselected ES no longer
-      * have decoder/are seen as selected */
-    if(b)
-        fakeesout->recycleAll();
     disabled = b;
 }
 



More information about the vlc-commits mailing list