Commit 8f72c1e2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

RTP: use --demux instead of --rtp-ts-demux

parent dbd272f4
......@@ -72,11 +72,6 @@
"RTP packets will be discarded if they are too far behind (i.e. in the " \
"past) by this many packets from the last received packet." )
#define RTP_TS_DEMUX_TEXT N_("Demux module for TS over RTP")
"MPEG Transport Stream packets within an RTP stream will be handled by " \
"the specified demux module." )
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
......@@ -110,9 +105,6 @@ vlc_module_begin ();
change_integer_range (0, 32767);
add_module ("rtp-ts-demux", "demux", "ts", NULL, RTP_TS_DEMUX_TEXT,
add_shortcut ("dccp");
/*add_shortcut ("sctp");*/
add_shortcut ("rtptcp"); /* "tcp" is already taken :( */
......@@ -617,12 +609,8 @@ static void mpv_decode (demux_t *demux, void *data, block_t *block)
static void *ts_init (demux_t *demux)
char *ts_demux = var_CreateGetNonEmptyString (demux, "rtp-ts-demux");
msg_Dbg (demux, "using %s chained demux", ts_demux);
if (!ts_demux)
return NULL;
void *stream = stream_init (demux, ts_demux);
char *ts_demux = var_CreateGetNonEmptyString (demux, "demux");
void *stream = stream_init (demux, ts_demux ? ts_demux : "ts");
free (ts_demux);
return stream;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment