Commit 03ae4817 authored by Edward Wang's avatar Edward Wang Committed by Rafaël Carré

avio: differentiate between avio-options and sout-avio-options in the GUI

Without this fix, they are indistinguishable in the GUI and the user cannot know which is which.
Pointed-out-by: default avatarEric Hameleers <alien@slackware.com>
Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
parent b57e3d3e
...@@ -46,4 +46,4 @@ void OutCloseAvio(vlc_object_t *); ...@@ -46,4 +46,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("sout-avio-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true) add_string("sout-avio-options", NULL, AV_SOUT_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true)
...@@ -75,6 +75,7 @@ static inline void vlc_init_avcodec(void) ...@@ -75,6 +75,7 @@ static inline void vlc_init_avcodec(void)
# include <libavutil/dict.h> # include <libavutil/dict.h>
#define AV_OPTIONS_TEXT "Advanced options" #define AV_OPTIONS_TEXT "Advanced options"
#define AV_SOUT_OPTIONS_TEXT "Advanced stream output options"
#define AV_OPTIONS_LONGTEXT "Advanced options, in the form {opt=val,opt2=val2}." #define AV_OPTIONS_LONGTEXT "Advanced options, in the form {opt=val,opt2=val2}."
static inline AVDictionary *vlc_av_get_options(const char *psz_opts) static inline AVDictionary *vlc_av_get_options(const char *psz_opts)
......
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