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

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 19 15:08:00 2013 +0200| [ceeaf1bc20616ec25cc61c60f04a7fef12670a1b] | committer: Jean-Baptiste Kempf

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

This reverts commit 03ae4817bae516a16dd7feb2c13c6a4d81d89068.

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

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

diff --git a/modules/access/avio.h b/modules/access/avio.h
index c18432c..ae95bee 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_SOUT_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true)
+        add_string("sout-avio-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true)
diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
index 517e867..dfd753e 100644
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -75,7 +75,6 @@ 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)