vlc | branch: master | Rafaël Carré <[email protected]> | Thu Nov 29 12:33:26 2012 +0100| [a4a65a5eddc34257a07f6e2ce2e0a8aee090aa08] | committer: Rafaël Carré
AVIO output: fix sout syntax Remove duplicate option > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a4a65a5eddc34257a07f6e2ce2e0a8aee090aa08 --- modules/access/avio.c | 11 ++++++++++- modules/access/avio.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/access/avio.c b/modules/access/avio.c index 7e61641..ddd7988 100644 --- a/modules/access/avio.c +++ b/modules/access/avio.c @@ -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); diff --git a/modules/access/avio.h b/modules/access/avio.h index 9bbce22..01a864a 100644 --- a/modules/access/avio.h +++ b/modules/access/avio.h @@ -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) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
