From fdb300b983744c522f335ccf64e9788b78f86701 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 21 Sep 2017 12:48:30 +0200 Subject: audio: make libaf derived code optional This code could not be relicensed. The intention was to write new filter code (which could handle both audio and video), but that's a bit of work. Write some code that can do audio conversion (resampling, downmixing, etc.) without the old audio filter chain code in order to speed up the LGPL relicensing. If you build with --disable-libaf, nothing in audio/filter/* is compiled in. It breaks a few features, such as --volume, --af, pitch correction on speed changes, replaygain. Most likely this adds some bugs, even if --disable-libaf is not used. (How the fuck does EOF notification work again anyway?) --- options/options.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index 9c435edb15..7dc3b0b160 100644 --- a/options/options.c +++ b/options/options.c @@ -44,12 +44,15 @@ #include "video/hwdec.h" #include "video/image_writer.h" #include "sub/osd.h" -#include "audio/filter/af.h" #include "audio/decode/dec_audio.h" #include "player/core.h" #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 @@ -418,8 +421,10 @@ const m_option_t mp_opts[] = { // ------------------------- codec/vfilter options -------------------- +#if HAVE_LIBAF OPT_SETTINGSLIST("af-defaults", af_defs, 0, &af_obj_list, ), OPT_SETTINGSLIST("af", af_settings, 0, &af_obj_list, ), +#endif OPT_SETTINGSLIST("vf-defaults", vf_defs, 0, &vf_obj_list, ), OPT_SETTINGSLIST("vf", vf_settings, 0, &vf_obj_list, ), -- cgit v1.2.3