Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
163dbff0
Commit
163dbff0
authored
Oct 16, 2011
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtsp: fix authentication variables
This is getting a bit lame
parent
4f410815
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+2
-2
modules/stream_out/rtsp.c
modules/stream_out/rtsp.c
+4
-4
No files found.
modules/stream_out/rtp.c
View file @
163dbff0
...
@@ -257,9 +257,9 @@ vlc_module_begin ()
...
@@ -257,9 +257,9 @@ vlc_module_begin ()
RTSP_HOST_LONGTEXT
,
true
)
RTSP_HOST_LONGTEXT
,
true
)
add_integer
(
"rtsp-timeout"
,
60
,
RTSP_TIMEOUT_TEXT
,
add_integer
(
"rtsp-timeout"
,
60
,
RTSP_TIMEOUT_TEXT
,
RTSP_TIMEOUT_LONGTEXT
,
true
)
RTSP_TIMEOUT_LONGTEXT
,
true
)
add_string
(
SOUT_CFG_PREFIX
"
user"
,
""
,
add_string
(
"sout-rtsp-
user"
,
""
,
RTSP_USER_TEXT
,
RTSP_USER_LONGTEXT
,
true
)
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
)
RTSP_PASS_TEXT
,
RTSP_PASS_LONGTEXT
,
true
)
vlc_module_end
()
vlc_module_end
()
...
...
modules/stream_out/rtsp.c
View file @
163dbff0
...
@@ -122,8 +122,8 @@ rtsp_stream_t *RtspSetup( vlc_object_t *owner, vod_media_t *media,
...
@@ -122,8 +122,8 @@ rtsp_stream_t *RtspSetup( vlc_object_t *owner, vod_media_t *media,
if
(
rtsp
->
host
==
NULL
)
if
(
rtsp
->
host
==
NULL
)
goto
error
;
goto
error
;
char
*
user
=
var_InheritString
(
owner
,
"rtsp-user"
);
char
*
user
=
var_InheritString
(
owner
,
"
sout-
rtsp-user"
);
char
*
pwd
=
var_InheritString
(
owner
,
"rtsp-pwd"
);
char
*
pwd
=
var_InheritString
(
owner
,
"
sout-
rtsp-pwd"
);
rtsp
->
url
=
httpd_UrlNewUnique
(
rtsp
->
host
,
rtsp
->
psz_path
,
rtsp
->
url
=
httpd_UrlNewUnique
(
rtsp
->
host
,
rtsp
->
psz_path
,
user
,
pwd
,
NULL
);
user
,
pwd
,
NULL
);
...
@@ -255,8 +255,8 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
...
@@ -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
);
msg_Dbg
(
rtsp
->
owner
,
"RTSP: adding %s"
,
urlbuf
);
char
*
user
=
var_InheritString
(
rtsp
->
owner
,
"rtsp-user"
);
char
*
user
=
var_InheritString
(
rtsp
->
owner
,
"
sout-
rtsp-user"
);
char
*
pwd
=
var_InheritString
(
rtsp
->
owner
,
"rtsp-pwd"
);
char
*
pwd
=
var_InheritString
(
rtsp
->
owner
,
"
sout-
rtsp-pwd"
);
url
=
id
->
url
=
httpd_UrlNewUnique
(
rtsp
->
host
,
urlbuf
,
user
,
pwd
,
NULL
);
url
=
id
->
url
=
httpd_UrlNewUnique
(
rtsp
->
host
,
urlbuf
,
user
,
pwd
,
NULL
);
free
(
user
);
free
(
user
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment