Commit af72dcc4 authored by Marian Durkovic's avatar Marian Durkovic
Browse files

get rid of confusing --sout-udp-ttl and unneded warning message

parent 00fa05ae
......@@ -77,10 +77,6 @@ static void Close( vlc_object_t * );
"Allows you to modify the default caching value for UDP streams. This " \
"value should be set in millisecond units." )
#define TTL_TEXT N_("Time To Live")
#define TTL_LONGTEXT N_("Allows you to define the time to live of the " \
"outgoing stream.")
#define GROUP_TEXT N_("Group packets")
#define GROUP_LONGTEXT N_("Packets can be sent one by one at the right time " \
"or by groups. This allows you to give the number " \
......@@ -99,8 +95,6 @@ vlc_module_begin();
set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_ACO );
add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL,TTL_TEXT, TTL_LONGTEXT,
VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "group", 1, NULL, GROUP_TEXT, GROUP_LONGTEXT,
VLC_TRUE );
add_suppressed_integer( SOUT_CFG_PREFIX "late" );
......@@ -119,7 +113,6 @@ vlc_module_end();
static const char *ppsz_sout_options[] = {
"caching",
"ttl",
"group",
"raw",
NULL
......@@ -199,8 +192,6 @@ static int Open( vlc_object_t *p_this )
if( p_access->psz_access != NULL &&
!strcmp( p_access->psz_access, "rtp" ) )
{
msg_Warn( p_access, "be careful that rtp output only works with ts "
"payload (not an error)" );
p_sys->b_rtpts = 1;
}
else
......@@ -258,9 +249,7 @@ static int Open( vlc_object_t *p_this )
socket_desc.i_bind_port = 0;
socket_desc.i_handle = -1;
socket_desc.v6only = 0;
var_Get( p_access, SOUT_CFG_PREFIX "ttl", &val );
socket_desc.i_ttl = val.i_int;
socket_desc.i_ttl = 0;
p_sys->p_thread->p_private = (void*)&socket_desc;
p_network = module_Need( p_sys->p_thread, "network", "ipv4", VLC_TRUE );
......
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