[vlc-commits] avio: differentiate between avio-options and sout-avio-options in the GUI

[Edward Wang]

vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sun Aug 18 23:27:19 2013 -0400| [03ae4817bae516a16dd7feb2c13c6a4d81d89068] | committer: 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: Eric Hameleers <alien at slackware.com>

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=03ae4817bae516a16dd7feb2c13c6a4d81d89068
---

 modules/access/avio.h            |    2 +-
 modules/codec/avcodec/avcommon.h |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/access/avio.h b/modules/access/avio.h
index ae95bee..c18432c 100644
--- 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 dfd753e..517e867 100644
--- 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)