[vlc-commits] directory: do not assume demux has an input

Rémi Denis-Courmont git at videolan.org
Mon Nov 13 18:43:15 CET 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 13 19:42:42 2017 +0200| [b696875781ad2462fbde36dd00ae57f7718e06a8] | committer: Rémi Denis-Courmont

directory: do not assume demux has an input

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

 modules/demux/directory.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/demux/directory.c b/modules/demux/directory.c
index 07c4e0b4c8..31a7cb7ece 100644
--- a/modules/demux/directory.c
+++ b/modules/demux/directory.c
@@ -78,6 +78,8 @@ static int Import_Dir( vlc_object_t *p_this )
 
     if( vlc_stream_Control( p_demux->s, STREAM_IS_DIRECTORY ) )
         return VLC_EGENERIC;
+    if( p_demux->p_input == NULL )
+        return VLC_ETIMEOUT;
 
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;



More information about the vlc-commits mailing list