Skip to content

V
vlc-2-2
Commit ceeaf1bc authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

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

This reverts commit 03ae4817.
parent 5e18c0b0
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
modules/access/avio.h
View file @ ceeaf1bc
...@@ -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_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
View file @ ceeaf1bc
...@@ -75,7 +75,6 @@ static inline void vlc_init_avcodec(void) ...@@ -75,7 +75,6 @@ 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