From 690a312f4241ba1730e5e36e039ea3bc9963bb03 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 23 Jun 2017 15:11:30 +0200 Subject: options: disable --field-dominance for WIP LGPL mode, also deprecate cehoyos, who did not agree to the LGPL relicensing, added this in commit 240b743e. The actual implementation of it is already guarded with HAVE_GPL. The field_dominance field in the option struct won't be guarded. We won't keep GPL-only core code forever, so deprecate it as well. To apply forced deinterlacing, a libavfilter filter can probably be removed, or we merge this functionality into the --deinterlace option (without using copyrighted stuff). --- options/options.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'options/options.c') diff --git a/options/options.c b/options/options.c index 56c6e3151a..adbb24fc05 100644 --- a/options/options.c +++ b/options/options.c @@ -436,8 +436,11 @@ const m_option_t mp_opts[] = { OPT_CHOICE("video-aspect-method", aspect_method, UPDATE_IMGPAR, ({"hybrid", 0}, {"bitstream", 1}, {"container", 2})), +#if HAVE_GPL OPT_CHOICE("field-dominance", field_dominance, UPDATE_IMGPAR, - ({"auto", -1}, {"top", 0}, {"bottom", 1})), + ({"auto", -1}, {"top", 0}, {"bottom", 1}), + .deprecation_message = "no replacement"), +#endif OPT_SUBSTRUCT("vd-lavc", vd_lavc_params, vd_lavc_conf, 0), OPT_SUBSTRUCT("ad-lavc", ad_lavc_params, ad_lavc_conf, 0), -- cgit v1.2.3