Cosmetics.

diff --git a/src/input/demux.c b/src/input/demux.c
index 89264a6533e0b758b20f38c30493062ca6fa0d8e..9d51e6acf0341bfa0f3eb1cd64ba4c3a256bd08c 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -324,7 +324,7 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
     stream_t       *s;
     d_stream_sys_t *p_sys;
 
-    s = vlc_stream_create( p_obj );
+    s = stream_CommonNew( p_obj );
     if( s == NULL )
         return NULL;
     s->pf_read   = DStreamRead;

diff --git a/src/input/stream.c b/src/input/stream.c
index c6395e1942cad2224aa9eef3c23c0fc5bb26fff8..4688ceaf4d10e7cd60f6c65a0a957392b270a297 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -263,6 +263,15 @@ static inline uint8_t * stream_buffer( stream_t *s )
     return s->p_sys->immediate.p_buffer;
 }
 
+/****************************************************************************
+ * stream_CommonNew: create an empty stream structure
+ ****************************************************************************/
+stream_t *stream_CommonNew( vlc_object_t *p_obj )
+{
+    return (stream_t *)vlc_custom_create( p_obj, sizeof(stream_t),
+                                          VLC_OBJECT_GENERIC, "stream" );
+}
+
 /****************************************************************************
  * stream_UrlNew: create a stream from a access
  ****************************************************************************/
@@ -301,7 +310,7 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url )
 
 stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
 {
-    stream_t *s = vlc_stream_create( VLC_OBJECT(p_access) );
+    stream_t *s = stream_CommonNew( VLC_OBJECT(p_access) );
     stream_sys_t *p_sys;
     char *psz_list = NULL;
 

diff --git a/src/input/stream.h b/src/input/stream.h
index 1cc712a5809c6f38215df8db9bcb65ece1488a62..5d0d935fbb6d3c15ff9517608ffee0aa7b46b545 100644 (file)
--- a/src/input/stream.h
+++ b/src/input/stream.h
@@ -53,13 +53,8 @@ struct stream_t
     bool            b_little_endian;
 };
 
-#include <libvlc.h>
-
-static inline stream_t *vlc_stream_create( vlc_object_t *obj )
-{
-    return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
-                                          VLC_OBJECT_GENERIC, "stream" );
-}
+/* */
+stream_t *stream_CommonNew( vlc_object_t * );
 
 /* */
 stream_t *stream_AccessNew( access_t *p_access, bool );

diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c
index 341f5f6083ff9915c2c29485f043094df02d4a82..d9db249ed4bf0a1faf6f5c17f90df7089e641a48 100644 (file)
--- a/src/input/stream_memory.c
+++ b/src/input/stream_memory.c
@@ -53,7 +53,7 @@ static void Delete ( stream_t * );
 stream_t *__stream_MemoryNew( vlc_object_t *p_this, uint8_t *p_buffer,
                               int64_t i_size, bool i_preserve_memory )
 {
-    stream_t *s = vlc_stream_create( p_this );
+    stream_t *s = stream_CommonNew( p_this );
     stream_sys_t *p_sys;
 
     if( !s ) return NULL;