[vlc-commits] demux: make demux_t an alias of stream_t (refs #18504)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Feb 26 21:54:15 2018 +0200| [897703bb5495a1b7c653256b5341de4884d96619] | committer: Rémi Denis-Courmont

demux: make demux_t an alias of stream_t (refs #18504)

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

 include/vlc_common.h |  2 +-
 include/vlc_demux.h  | 47 -----------------------------------------------
 2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index b705887e7e..bab06bcf41 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -355,7 +355,7 @@ typedef struct input_item_node_t input_item_node_t;
 typedef struct access_sys_t access_sys_t;
 typedef struct stream_t     stream_t;
 typedef struct stream_sys_t stream_sys_t;
-typedef struct demux_t  demux_t;
+typedef struct stream_t demux_t;
 typedef struct demux_sys_t demux_sys_t;
 typedef struct es_out_t     es_out_t;
 typedef struct es_out_id_t  es_out_id_t;
diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index ff55287fe9..1b547d2774 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -40,53 +40,6 @@
  * Demultiplexer modules interface
  */
 
-struct demux_t
-{
-    struct vlc_common_members obj;
-
-    /* Module properties */
-    module_t    *p_module;
-
-    /* eg informative but needed (we can have access+demux) */
-    char        *psz_name;
-    char        *psz_url;
-    const char  *psz_location;
-    char        *psz_filepath;
-
-    union {
-        /**
-         * Input stream
-         *
-         * Depending on the module capability:
-         * - "demux": input byte stream (not NULL)
-         * - "access_demux": a NULL pointer
-         * - "demux_filter": undefined
-         */
-        stream_t *s;
-        /**
-         * Input demuxer
-         *
-         * If the module capability is "demux_filter", this is the upstream
-         * demuxer or demux filter. Otherwise, this is undefined.
-         */
-        demux_t *p_next;
-    };
-
-    /* es output */
-    es_out_t    *out;   /* our p_es_out */
-
-    bool         b_preparsing; /* True if the demux is used to preparse */
-
-    /* set by demuxer */
-    int (*pf_demux)  ( demux_t * );   /* demux one frame only */
-    int (*pf_control)( demux_t *, int i_query, va_list args);
-
-    void *p_sys;
-
-    /* Weak link to parent input */
-    input_thread_t *p_input;
-};
-
 /* pf_demux return values */
 #define VLC_DEMUXER_EOF       0
 #define VLC_DEMUXER_EGENERIC -1