summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-23 15:11:30 +0200
committerwm4 <wm4@nowhere>2017-06-23 16:52:52 +0200
commit690a312f4241ba1730e5e36e039ea3bc9963bb03 (patch)
treea1cc5a0f9bc4a9e72378ffb2d9b3ff126b82e43f /options/options.c
parentdcd4528d219962d692b0108c42a2fbd028db0244 (diff)
downloadmpv-690a312f4241ba1730e5e36e039ea3bc9963bb03.tar.bz2
mpv-690a312f4241ba1730e5e36e039ea3bc9963bb03.tar.xz
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).
Diffstat (limited to 'options/options.c')
-rw-r--r--options/options.c5
1 files changed, 4 insertions, 1 deletions
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),