diff options
| author | wm4 <wm4@nowhere> | 2012-08-18 11:13:58 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-20 15:36:02 +0200 |
| commit | 8ca3ec1562986c0681261cad407e05578eda45fd (patch) | |
| tree | 0822a5c95e2b0e26ec9497e6826a98db8704dfa2 /cfg-mplayer.h | |
| parent | fc2ea37694a6e508fe6ebc56711b11be592c7a8d (diff) | |
| download | mpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.bz2 mpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.xz | |
libmpdemux: remove demux_real, demux_viv, demux_audio
libavformat replaces demux_audio completely. I don't know/care what
vivo (demux_viv) is. libavformat has a Real demuxer; it seems it works
slightly better, with a different set of bugs.
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index da39b06c65..7d26316ac5 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -204,31 +204,8 @@ const m_option_t scaler_filter_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -/* VIVO demuxer options: */ -extern int vivo_param_version; -extern char *vivo_param_acodec; -extern int vivo_param_abitrate; -extern int vivo_param_samplerate; -extern int vivo_param_bytesperblock; -extern int vivo_param_width; -extern int vivo_param_height; -extern int vivo_param_vformat; extern char *dvd_device, *cdrom_device; -const m_option_t vivoopts_conf[]={ - {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL}, - /* audio options */ - {"acodec", &vivo_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"abitrate", &vivo_param_abitrate, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"samplerate", &vivo_param_samplerate, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"bytesperblock", &vivo_param_bytesperblock, CONF_TYPE_INT, 0, 0, 0, NULL}, - /* video options */ - {"width", &vivo_param_width, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"height", &vivo_param_height, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"vformat", &vivo_param_vformat, CONF_TYPE_INT, 0, 0, 0, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; - extern int mf_w; extern int mf_h; extern double mf_fps; @@ -485,7 +462,6 @@ const m_option_t common_opts[] = { #ifdef CONFIG_PVR {"pvr", (void *) pvropts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif /* CONFIG_PVR */ - {"vivo", (void *) vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #ifdef CONFIG_DVBIN {"dvbin", (void *) dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif |