diff options
author | wm4 <wm4@nowhere> | 2017-06-23 15:11:30 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-06-23 16:52:52 +0200 |
commit | 690a312f4241ba1730e5e36e039ea3bc9963bb03 (patch) | |
tree | a1cc5a0f9bc4a9e72378ffb2d9b3ff126b82e43f | |
parent | dcd4528d219962d692b0108c42a2fbd028db0244 (diff) | |
download | mpv-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).
-rw-r--r-- | DOCS/interface-changes.rst | 1 | ||||
-rw-r--r-- | options/options.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index d3e77187e8..7f5c7219c5 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -35,6 +35,7 @@ Interface changes the reference white level instead of in cd/m^2 - renamed the TRCs `st2084` and `std-b67` to `pq` and `hlg` respectively - the "osd" command is deprecated (use "cycle osd-level") + - --field-dominance is deprecated (no replacement) --- mpv 0.25.0 --- - remove opengl-cb dxva2 dummy hwdec interop (see git "vo_opengl: remove dxva2 dummy hwdec backend") 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), |