diff options
author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /core/cfg-mplayer.h | |
parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'core/cfg-mplayer.h')
-rw-r--r-- | core/cfg-mplayer.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 5b30e387c3..baf0820f48 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -175,11 +175,6 @@ const m_option_t mfopts_conf[]={ #include "audio/filter/af.h" extern struct af_cfg af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c -const m_option_t audio_filter_conf[]={ - {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, - {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL}, - {NULL, NULL, 0, 0, 0, 0, NULL} -}; extern int mp_msg_levels[MSGT_MAX]; extern int mp_msg_level_all; @@ -281,6 +276,7 @@ const m_option_t msgl_config[]={ }; extern const m_option_t lavc_decode_opts_conf[]; +extern const m_option_t ad_lavc_decode_opts_conf[]; #define OPT_BASE_STRUCT struct MPOpts @@ -418,7 +414,7 @@ const m_option_t common_opts[] = { // force video/audio rate: OPT_DOUBLE("fps", force_fps, CONF_MIN, 0), OPT_INTRANGE("srate", force_srate, 0, 1000, 8*48000), - OPT_INTRANGE("channels", audio_output_channels, 0, 1, 8), + OPT_CHMAP("channels", audio_output_channels, CONF_MIN, .min = 1), OPT_AUDIOFORMAT("format", audio_output_format, 0), OPT_FLOATRANGE("speed", playback_speed, 0, 0.01, 100.0), @@ -428,15 +424,12 @@ const m_option_t common_opts[] = { // ignore header-specified delay (dwStart) OPT_FLAG("ignore-start", ignore_start, 0), - OPT_FLOATRANGE("a52drc", drc_level, 0, 0, 2), - // ------------------------- codec/vfilter options -------------------- // MP3-only: select stereo/left/right {"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, {"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, - {"af-adv", (void *) audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, OPT_SETTINGSLIST("vf*", vf_settings, 0, &vf_obj_list), @@ -472,6 +465,8 @@ const m_option_t common_opts[] = { {"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + + {"ad-lavc", (void *) ad_lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG}, // ------------------------- subtitles options -------------------- OPT_STRINGLIST("sub", sub_name, 0), |