summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-07-21 20:00:09 +0200
committerwm4 <wm4@nowhere>2017-07-21 20:00:09 +0200
commit4bc29c173090de173300b6e36da2bec1cae8c6f6 (patch)
treef9cdaaa43da04f91c18cb6cf7db8f05ad4e86b03
parent7a51271d3d65f7be8911d835ed5f9bf22ea2eaee (diff)
downloadmpv-4bc29c173090de173300b6e36da2bec1cae8c6f6.tar.bz2
mpv-4bc29c173090de173300b6e36da2bec1cae8c6f6.tar.xz
options: kill --field-dominance
GPL-only author, no chance of relicensing.
-rw-r--r--DOCS/interface-changes.rst2
-rw-r--r--DOCS/man/options.rst12
-rw-r--r--DOCS/man/vf.rst2
-rw-r--r--DOCS/man/vo.rst2
-rw-r--r--options/options.c7
-rw-r--r--options/options.h1
-rw-r--r--video/decode/dec_video.c9
7 files changed, 4 insertions, 31 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index baf767649e..9048a29a3a 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -19,6 +19,8 @@ Interface changes
::
+ --- mpv 0.27.0 ---
+ - drop previously deprecated --field-dominance option
--- mpv 0.26.0 ---
- remove remaining deprecated audio device options, like --alsa-device
Some of them were removed in earlier releases.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 5c25794588..bb5ba6636a 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -955,18 +955,6 @@ Video
added to the filter chain manually with ``--vf``. Then the core shouldn't
disable deinterlacing just because the ``--deinterlace`` was not set.
-``--field-dominance=<auto|top|bottom>``
- Set first field for interlaced content.
-
- :auto: (default) If the decoder does not export the appropriate
- information, it falls back on ``top`` (top field first).
- :top: top field first
- :bottom: bottom field first
-
- .. note::
-
- Setting either ``top`` or ``bottom`` will flag all frames as interlaced.
-
``--frames=<number>``
Play/convert only first ``<number>`` video frames, then quit.
diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst
index 9e416b8df8..9ed8f2f047 100644
--- a/DOCS/man/vf.rst
+++ b/DOCS/man/vf.rst
@@ -787,7 +787,7 @@ Available mpv-only filters are:
no
Don't perform deinterlacing.
first-field
- Show only first field (going by ``--field-dominance``).
+ Show only first field.
bob
bob deinterlacing (default).
weave, motion-adaptive, motion-compensated
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index 20e8e0baf7..1552b217cb 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -356,7 +356,7 @@ Available video output drivers are:
no
Don't allow deinterlacing (default for newer libva).
first-field
- Show only first field (going by ``--field-dominance``).
+ Show only first field.
bob
bob deinterlacing (default for older libva).
diff --git a/options/options.c b/options/options.c
index 2b9a630bc9..56df6706ee 100644
--- a/options/options.c
+++ b/options/options.c
@@ -445,12 +445,6 @@ 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}),
- .deprecation_message = "use --vf=setfield=bff or tff"),
-#endif
-
OPT_SUBSTRUCT("vd-lavc", vd_lavc_params, vd_lavc_conf, 0),
OPT_SUBSTRUCT("ad-lavc", ad_lavc_params, ad_lavc_conf, 0),
@@ -934,7 +928,6 @@ const struct MPOpts mp_default_opts = {
.pitch_correction = 1,
.movie_aspect = -1.,
.aspect_method = 2,
- .field_dominance = -1,
.sub_auto = 0,
.audiofile_auto = -1,
.osd_bar_visible = 1,
diff --git a/options/options.h b/options/options.h
index 8c28a70d99..4482b0f824 100644
--- a/options/options.h
+++ b/options/options.h
@@ -253,7 +253,6 @@ typedef struct MPOpts {
int deinterlace;
float movie_aspect;
int aspect_method;
- int field_dominance;
char **sub_name;
char **sub_paths;
char **audiofile_paths;
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index f7ca6cc477..c98ab2b8b7 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -327,15 +327,6 @@ static bool receive_frame(struct dec_video *d_video, struct mp_image **out_image
if (!mpi)
return progress;
-#if HAVE_GPL
- if (opts->field_dominance == 0) {
- mpi->fields |= MP_IMGFIELD_TOP_FIRST | MP_IMGFIELD_INTERLACED;
- } else if (opts->field_dominance == 1) {
- mpi->fields &= ~MP_IMGFIELD_TOP_FIRST;
- mpi->fields |= MP_IMGFIELD_INTERLACED;
- }
-#endif
-
// Note: the PTS is reordered, but the DTS is not. Both should be monotonic.
double pts = mpi->pts;
double dts = mpi->dts;