diff options
| author | wm4 <wm4@nowhere> | 2018-01-18 14:44:20 +0100 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-01-30 03:10:27 -0800 |
| commit | b9f804b566c4c528714e4ec5e63675ad7ba5fefd (patch) | |
| tree | 49d6fcd42ce6597a67aa2af59b7f20beb21a2e14 /options | |
| parent | 76276c92104c31ee936ba5c76a76072f09978c5f (diff) | |
| download | mpv-b9f804b566c4c528714e4ec5e63675ad7ba5fefd.tar.bz2 mpv-b9f804b566c4c528714e4ec5e63675ad7ba5fefd.tar.xz | |
audio: rewrite filtering glue code
Use the new filtering code for audio too.
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 12 | ||||
| -rw-r--r-- | options/options.h | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/options/options.c b/options/options.c index ce602f2683..bce2bf3be6 100644 --- a/options/options.c +++ b/options/options.c @@ -47,10 +47,6 @@ #include "player/command.h" #include "stream/stream.h" -#if HAVE_LIBAF -#include "audio/filter/af.h" -#endif - #if HAVE_DRM #include "video/out/drm_common.h" #endif @@ -94,8 +90,6 @@ extern const struct m_sub_options angle_conf; extern const struct m_sub_options cocoa_conf; extern const struct m_sub_options android_conf; -extern const struct m_sub_options resample_config; - static const struct m_sub_options screenshot_conf = { .opts = image_writer_opts, .size = sizeof(struct image_writer_opts), @@ -485,7 +479,7 @@ const m_option_t mp_opts[] = { // force video/audio rate: OPT_DOUBLE("fps", force_fps, CONF_MIN, .min = 0), - OPT_INTRANGE("audio-samplerate", force_srate, UPDATE_AUDIO, 1000, 16*48000), + OPT_INTRANGE("audio-samplerate", force_srate, UPDATE_AUDIO, 0, 16*48000), OPT_CHANNELS("audio-channels", audio_output_channels, UPDATE_AUDIO), OPT_AUDIOFORMAT("audio-format", audio_output_format, UPDATE_AUDIO), OPT_DOUBLE("speed", playback_speed, M_OPT_RANGE, .min = 0.01, .max = 100.0), @@ -497,11 +491,9 @@ const m_option_t mp_opts[] = { // ------------------------- codec/vfilter options -------------------- -#if HAVE_LIBAF OPT_SETTINGSLIST("af-defaults", af_defs, 0, &af_obj_list, .deprecation_message = "use --af + enable/disable flags"), OPT_SETTINGSLIST("af", af_settings, 0, &af_obj_list, ), -#endif OPT_SETTINGSLIST("vf-defaults", vf_defs, 0, &vf_obj_list, .deprecation_message = "use --vf + enable/disable flags"), OPT_SETTINGSLIST("vf", vf_settings, 0, &vf_obj_list, ), @@ -711,7 +703,7 @@ const m_option_t mp_opts[] = { OPT_STRING("record-file", record_file, M_OPT_FILE), - OPT_SUBSTRUCT("", resample_opts, resample_config, 0), + OPT_SUBSTRUCT("", resample_opts, resample_conf, 0), OPT_SUBSTRUCT("", input_opts, input_config, 0), diff --git a/options/options.h b/options/options.h index a3444dbd4d..db5b92b86a 100644 --- a/options/options.h +++ b/options/options.h @@ -365,6 +365,7 @@ extern const struct m_sub_options dvd_conf; extern const struct m_sub_options mp_subtitle_sub_opts; extern const struct m_sub_options mp_osd_render_sub_opts; extern const struct m_sub_options filter_conf; +extern const struct m_sub_options resample_conf; int hwdec_validate_opt(struct mp_log *log, const m_option_t *opt, struct bstr name, struct bstr param); |