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
a4a65a5e
Commit
a4a65a5e
authored
Nov 29, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AVIO output: fix sout syntax
Remove duplicate option
parent
08223d48
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
modules/access/avio.c
modules/access/avio.c
+10
-1
modules/access/avio.h
modules/access/avio.h
+1
-1
No files found.
modules/access/avio.c
View file @
a4a65a5e
...
...
@@ -204,9 +204,18 @@ error:
}
/* */
static
const
char
*
const
ppsz_sout_options
[]
=
{
"options"
,
NULL
,
};
int
OutOpenAvio
(
vlc_object_t
*
object
)
{
sout_access_out_t
*
access
=
(
sout_access_out_t
*
)
object
;
config_ChainParse
(
access
,
"sout-avio-"
,
ppsz_sout_options
,
access
->
p_cfg
);
sout_access_out_sys_t
*
sys
=
malloc
(
sizeof
(
*
sys
));
if
(
!
sys
)
return
VLC_ENOMEM
;
...
...
@@ -227,7 +236,7 @@ int OutOpenAvio(vlc_object_t *object)
.
opaque
=
access
,
};
AVDictionary
*
options
=
NULL
;
char
*
psz_opts
=
var_InheritString
(
access
,
"avio-options"
);
char
*
psz_opts
=
var_InheritString
(
access
,
"
sout-
avio-options"
);
if
(
psz_opts
&&
*
psz_opts
)
{
options
=
vlc_av_get_options
(
psz_opts
);
free
(
psz_opts
);
...
...
modules/access/avio.h
View file @
a4a65a5e
...
...
@@ -52,4 +52,4 @@ void OutCloseAvio(vlc_object_t *);
set_subcategory( SUBCAT_SOUT_ACO ) \
add_shortcut( "avio", "rtmp" ) \
set_callbacks( OutOpenAvio, OutCloseAvio) \
add_string("avio-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true)
add_string("
sout-
avio-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_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