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: Eric Hameleers <alien@slackware.com>
Signed-off-by: Rafaël Carré <funman@videolan.org>

diff --git a/modules/access/avio.h b/modules/access/avio.h
index ae95beea27dfefca15f7608675c41792c2002998..c18432c1feb8336e8ec946876444ab686d7ad14a 100644 (file)
--- a/modules/access/avio.h
+++ b/modules/access/avio.h
@@ -46,4 +46,4 @@ void OutCloseAvio(vlc_object_t *);
         set_subcategory( SUBCAT_SOUT_ACO ) \
         add_shortcut( "avio", "rtmp" ) \
         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)

diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
index dfd753e9a15c64050e11bcf9b9673027c4809f98..517e867c9206eaff7d6f9a67caad3d2898557bce 100644 (file)
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -75,6 +75,7 @@ static inline void vlc_init_avcodec(void)
 # include <libavutil/dict.h>
 
 #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}."
 
 static inline AVDictionary *vlc_av_get_options(const char *psz_opts)