[vlc-commits] demux: adaptive: fix assertion on pause (fix #17887)

Francois Cartegnie git at videolan.org
Mon Jan 16 12:06:02 CET 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jan 16 12:05:19 2017 +0100| [eea96dcf9492b29d11cd5e790d6f6756de4babe0] | committer: Francois Cartegnie

demux: adaptive: fix assertion on pause (fix #17887)

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

 modules/demux/adaptive/PlaylistManager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index 58056ce..b9e1df8 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -501,8 +501,10 @@ int PlaylistManager::doControl(int i_query, va_list args)
 
         case DEMUX_CAN_PAUSE:
         {
-            vlc_mutex_locker locker(&cached.lock);
-            *(va_arg (args, bool *)) = ! cached.b_live;
+            /* Always return true then fail late.
+             * See demux.c/demux_vaControl,
+             * misleading and should be DEMUX_CAN_CONTROL_PAUSE */
+            *(va_arg (args, bool *)) = true;
             break;
         }
 



More information about the vlc-commits mailing list