Commit a4a65a5e authored by Rafaël Carré's avatar Rafaël Carré

AVIO output: fix sout syntax

Remove duplicate option
parent 08223d48
...@@ -204,9 +204,18 @@ error: ...@@ -204,9 +204,18 @@ error:
} }
/* */ /* */
static const char *const ppsz_sout_options[] = {
"options",
NULL,
};
int OutOpenAvio(vlc_object_t *object) int OutOpenAvio(vlc_object_t *object)
{ {
sout_access_out_t *access = (sout_access_out_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)); sout_access_out_sys_t *sys = malloc(sizeof(*sys));
if (!sys) if (!sys)
return VLC_ENOMEM; return VLC_ENOMEM;
...@@ -227,7 +236,7 @@ int OutOpenAvio(vlc_object_t *object) ...@@ -227,7 +236,7 @@ int OutOpenAvio(vlc_object_t *object)
.opaque = access, .opaque = access,
}; };
AVDictionary *options = NULL; 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) { if (psz_opts && *psz_opts) {
options = vlc_av_get_options(psz_opts); options = vlc_av_get_options(psz_opts);
free(psz_opts); free(psz_opts);
......
...@@ -52,4 +52,4 @@ void OutCloseAvio(vlc_object_t *); ...@@ -52,4 +52,4 @@ void OutCloseAvio(vlc_object_t *);
set_subcategory( SUBCAT_SOUT_ACO ) \ set_subcategory( SUBCAT_SOUT_ACO ) \
add_shortcut( "avio", "rtmp" ) \ add_shortcut( "avio", "rtmp" ) \
set_callbacks( OutOpenAvio, OutCloseAvio) \ 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)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment