[vlc-commits] demux: demux_vaControlHelper() is not meant for playlist demuxers

Rémi Denis-Courmont git at videolan.org
Wed Sep 2 21:54:14 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Sep  2 21:39:04 2015 +0300| [605b5cb8e06e621500d3d16d7dff921e39b3ad6b] | committer: Rémi Denis-Courmont

demux: demux_vaControlHelper() is not meant for playlist demuxers

The demuxers that can this function predate directory/explicit playlist
support.

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

 src/input/demux.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index e89452a..91f1742 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -323,11 +323,8 @@ int demux_vaControlHelper( stream_t *s,
             return stream_vaControl( s, STREAM_GET_META, args );
 
         case DEMUX_IS_PLAYLIST:
-        {
-            bool *pb_isplaylist = va_arg( args, bool * );
-            return stream_Control( s, STREAM_IS_DIRECTORY, pb_isplaylist,
-                                   NULL, NULL );
-        }
+            *va_arg( args, bool * ) = false;
+            return VLC_SUCCESS;
 
         case DEMUX_GET_PTS_DELAY:
         case DEMUX_GET_FPS:



More information about the vlc-commits mailing list