vlc | branch: master | Pierre Ynard <[email protected]> | Sun Oct 16 04:42:54 2011 +0200| [163dbff0a058287b4b52c74d2c055cb41d2545c4] | committer: Pierre Ynard
rtsp: fix authentication variables This is getting a bit lame > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=163dbff0a058287b4b52c74d2c055cb41d2545c4 --- modules/stream_out/rtp.c | 4 ++-- modules/stream_out/rtsp.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index f414d64..613f6c0 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -257,9 +257,9 @@ vlc_module_begin () RTSP_HOST_LONGTEXT, true ) add_integer( "rtsp-timeout", 60, RTSP_TIMEOUT_TEXT, RTSP_TIMEOUT_LONGTEXT, true ) - add_string( SOUT_CFG_PREFIX "user", "", + add_string( "sout-rtsp-user", "", RTSP_USER_TEXT, RTSP_USER_LONGTEXT, true ) - add_password( SOUT_CFG_PREFIX "pwd", "", + add_password( "sout-rtsp-pwd", "", RTSP_PASS_TEXT, RTSP_PASS_LONGTEXT, true ) vlc_module_end () diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c index 783bda4..c71139f 100644 --- a/modules/stream_out/rtsp.c +++ b/modules/stream_out/rtsp.c @@ -122,8 +122,8 @@ rtsp_stream_t *RtspSetup( vlc_object_t *owner, vod_media_t *media, if( rtsp->host == NULL ) goto error; - char *user = var_InheritString(owner, "rtsp-user"); - char *pwd = var_InheritString(owner, "rtsp-pwd"); + char *user = var_InheritString(owner, "sout-rtsp-user"); + char *pwd = var_InheritString(owner, "sout-rtsp-pwd"); rtsp->url = httpd_UrlNewUnique( rtsp->host, rtsp->psz_path, user, pwd, NULL ); @@ -255,8 +255,8 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid, msg_Dbg( rtsp->owner, "RTSP: adding %s", urlbuf ); - char *user = var_InheritString(rtsp->owner, "rtsp-user"); - char *pwd = var_InheritString(rtsp->owner, "rtsp-pwd"); + char *user = var_InheritString(rtsp->owner, "sout-rtsp-user"); + char *pwd = var_InheritString(rtsp->owner, "sout-rtsp-pwd"); url = id->url = httpd_UrlNewUnique( rtsp->host, urlbuf, user, pwd, NULL ); free( user ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
