[vlc-commits] access: develop stream_FilterAutoNew() calls

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Apr 16 17:22:25 2018 +0300| [fc7362222b3ccfa6417c06f3ad85268dc88ed889] | committer: Rémi Denis-Courmont

access: develop stream_FilterAutoNew() calls

Moves calls to stream_FilterAutoNew() out of stream_AccessNew().
No overall functional changes.

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

 src/input/access.c | 2 +-
 src/input/input.c  | 2 ++
 src/input/stream.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/input/access.c b/src/input/access.c
index 6d624d65c5..33313ddd17 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -289,5 +289,5 @@ stream_t *stream_AccessNew(vlc_object_t *parent, input_thread_t *input,
     else
         s = access;
 
-    return stream_FilterAutoNew(s);
+    return s;
 }
diff --git a/src/input/input.c b/src/input/input.c
index c9e19504d2..36a8b6e0fa 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2416,6 +2416,8 @@ static demux_t *InputDemuxNew( input_thread_t *p_input,
     if( p_stream == NULL )
         return NULL;
 
+    p_stream = stream_FilterAutoNew( p_stream );
+
     if( p_stream->pf_read == NULL && p_stream->pf_block == NULL
      && p_stream->pf_readdir == NULL )
     {   /* Combined access/demux, no stream filtering */
diff --git a/src/input/stream.c b/src/input/stream.c
index 3f7c6789b8..c4224b0c08 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -147,6 +147,8 @@ stream_t *(vlc_stream_NewURL)(vlc_object_t *p_parent, const char *psz_url)
     stream_t *s = stream_AccessNew( p_parent, NULL, NULL, false, psz_url );
     if( s == NULL )
         msg_Err( p_parent, "no suitable access module for `%s'", psz_url );
+    else
+        s = stream_FilterAutoNew(s);
     return s;
 }