Commit 47d4e675 authored by Laurent Aimar's avatar Laurent Aimar

* input: :demux=module really force module and bypass demuxer module given

by access.
 * udp: force ts demux on payload 33 (:demux=dump will work)
parent d4c07f8d
......@@ -456,8 +456,7 @@ static block_t *BlockChoose( access_t *p_access )
{
case 33:
msg_Dbg( p_access, "detected TS over RTP" );
/* Disabled because it is auto-detected. */
/* p_access->psz_demux = strdup( "ts" ); */
p_access->psz_demux = strdup( "ts" );
break;
case 14:
......
......@@ -1944,7 +1944,29 @@ static int InputSourceInit( input_thread_t *p_input,
&in->i_seekpoint_start, &in->i_seekpoint_end );
if( psz_forced_demux && *psz_forced_demux )
{
if( psz_demux ) free( psz_demux );
psz_demux = psz_forced_demux;
}
else if( !psz_demux || *psz_demux == '\0' )
{
/* special hack for forcing a demuxer with --demux=module
* (and do nothing with a list) */
char *psz_var_demux = var_GetString( p_input, "demux" );
if( *psz_var_demux != '\0' &&
!strchr(psz_var_demux, ',' ) &&
!strchr(psz_var_demux, ':' ) )
{
psz_demux = psz_var_demux;
msg_Dbg( p_input, "Enforce demux ` %s'", psz_demux );
}
else if( psz_var_demux )
{
free( psz_var_demux );
}
}
/* Try access_demux if no demux given */
if( *psz_demux == '\0' )
......
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