vlc | branch: master | Pierre Ynard <[email protected]> | Tue Oct 4 04:13:14 2011 +0200| [c1e371c81654dd6d714e78a1d3833670e3c73ac4] | committer: Pierre Ynard
rtp out: add glue code to set httpd configuration > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1e371c81654dd6d714e78a1d3833670e3c73ac4 --- modules/stream_out/rtp.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 08ad3ea..37d0833 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -719,16 +719,24 @@ static void SDPHandleUrl( sout_stream_t *p_stream, const char *psz_url ) if( url.psz_host != NULL && *url.psz_host ) { - msg_Err( p_stream, "\"%s\" RTSP host ignored", url.psz_host ); + /* msg_Err( p_stream, "\"%s\" RTSP host ignored", url.psz_host ); msg_Info( p_stream, "Pass --rtsp-host=%s on the command line " - "instead.", url.psz_host ); + "instead.", url.psz_host ); */ + + var_Create( p_stream, "rtsp-host", VLC_VAR_STRING ); + var_SetString( p_stream, "rtsp-host", url.psz_host ); } - if( url.i_port != 0 ) + /* if( url.i_port != 0 ) { msg_Err( p_stream, "\"%u\" RTSP port ignored", url.i_port ); msg_Info( p_stream, "Pass --rtsp-port=%u on the command line " "instead.", url.i_port ); - } + } */ + + if( url.i_port <= 0 ) url.i_port = 554; + var_Create( p_stream, "rtsp-port", VLC_VAR_INTEGER ); + var_SetInteger( p_stream, "rtsp-port", url.i_port ); + p_sys->rtsp = RtspSetup( VLC_OBJECT(p_stream), NULL, url.psz_path ); if( p_sys->rtsp == NULL ) msg_Err( p_stream, "cannot export SDP as RTSP" ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
