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

This reverts commit 03ae4817.

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)

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)