Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
bc17f428
Commit
bc17f428
authored
Dec 18, 2011
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtsp: fix up duplicate --rtsp-host option declaration
parent
50727767
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+0
-9
src/libvlc-module.c
src/libvlc-module.c
+9
-2
No files found.
modules/stream_out/rtp.c
View file @
bc17f428
...
...
@@ -164,13 +164,6 @@ static const char *const ppsz_protocols[] = {
#define RFC3016_LONGTEXT N_( \
"This allows you to stream MPEG4 LATM audio streams (see RFC3016)." )
#define RTSP_HOST_TEXT N_( "RTSP host address" )
#define RTSP_HOST_LONGTEXT N_( \
"This defines the address, port and path the RTSP VOD server will listen " \
"on.\nSyntax is address:port/path. The default is to listen on all "\
"interfaces (address 0.0.0.0), on port 554, with no path.\nTo listen " \
"only on the local interface, use \"localhost\" as address." )
#define RTSP_TIMEOUT_TEXT N_( "RTSP session timeout (s)" )
#define RTSP_TIMEOUT_LONGTEXT N_( "RTSP sessions will be closed after " \
"not receiving any RTSP request for this long. Setting it to a " \
...
...
@@ -255,8 +248,6 @@ vlc_module_begin ()
set_capability
(
"vod server"
,
10
)
set_callbacks
(
OpenVoD
,
CloseVoD
)
add_shortcut
(
"rtsp"
)
add_string
(
"rtsp-host"
,
NULL
,
RTSP_HOST_TEXT
,
RTSP_HOST_LONGTEXT
,
true
)
add_integer
(
"rtsp-timeout"
,
60
,
RTSP_TIMEOUT_TEXT
,
RTSP_TIMEOUT_LONGTEXT
,
true
)
add_string
(
"sout-rtsp-user"
,
""
,
...
...
src/libvlc-module.c
View file @
bc17f428
...
...
@@ -915,12 +915,19 @@ static const char *const ppsz_prefres[] = {
"Default TCP connection timeout (in milliseconds). " )
#define HTTP_HOST_TEXT N_( "HTTP server address" )
#define RTSP_HOST_TEXT N_( "RTSP server address" )
#define HOST_LONGTEXT N_( \
"By default, the server will listen on any local IP address. " \
"Specify an IP address (e.g. ::1 or 127.0.0.1) or a host name " \
"(e.g. localhost) to restrict them to a specific network interface." )
#define RTSP_HOST_TEXT N_( "RTSP server address" )
#define RTSP_HOST_LONGTEXT N_( \
"This defines the address the RTSP server will listen on, along " \
"with the base path of the RTSP VOD media. Syntax is address/path. " \
"By default, the server will listen on any local IP address. " \
"Specify an IP address (e.g. ::1 or 127.0.0.1) or a host name " \
"(e.g. localhost) to restrict them to a specific network interface." )
#define HTTP_PORT_TEXT N_( "HTTP server port" )
#define HTTP_PORT_LONGTEXT N_( \
"The HTTP server will listen on this TCP port. " \
...
...
@@ -1876,7 +1883,7 @@ vlc_module_begin ()
change_integer_range
(
1
,
65535
)
add_integer
(
"https-port"
,
8443
,
HTTPS_PORT_TEXT
,
HTTPS_PORT_LONGTEXT
,
true
)
change_integer_range
(
1
,
65535
)
add_string
(
"rtsp-host"
,
NULL
,
RTSP_HOST_TEXT
,
HOST_LONGTEXT
,
true
)
add_string
(
"rtsp-host"
,
NULL
,
RTSP_HOST_TEXT
,
RTSP_
HOST_LONGTEXT
,
true
)
add_integer
(
"rtsp-port"
,
554
,
RTSP_PORT_TEXT
,
RTSP_PORT_LONGTEXT
,
true
)
change_integer_range
(
1
,
65535
)
add_loadfile
(
"http-cert"
,
NULL
,
HTTP_CERT_TEXT
,
CERT_LONGTEXT
,
true
)
...
...
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