vo_vdpau: remove deprecated/inactive --vo-vdpau-deint option

I think this has been dead code for quite a while. It was deprecated
anyway.

4 files changed, 1 insertions, 30 deletions

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 0e8957134b..0089f4425b 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -78,6 +78,7 @@ Interface changes
       To get the old behavior, set the "passthrough_stdin" argument to true.
     - key/value list options do not accept ":" as item separator anymore,
       only ",". This means ":" is always considered part of the value.
+    - remove deprecated --vo-vdpau-deint option
  --- mpv 0.32.0 ---
     - change behavior when using legacy option syntax with options that start
       with two dashes (``--`` instead of a ``-``). Now, using the recommended
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index d97bdba537..570e244e5c 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -99,29 +99,6 @@ Available video output drivers are:
 
         Apply a noise reduction algorithm to the video (default: 0; no noise
         reduction).
-    ``--vo-vdpau-deint=<-4-4>``
-        (Deprecated. See note about ``vdpaupp``.)
-
-        Select deinterlacing mode (default: 0). In older versions (as well as
-        MPlayer/mplayer2) you could use this option to enable deinterlacing.
-        This doesn't work anymore, and deinterlacing is enabled with either
-        the ``d`` key (by default mapped to the command ``cycle deinterlace``),
-        or the ``--deinterlace`` option. Also, to select the default deint mode,
-        you should use something like ``--vf-defaults=vdpaupp:deint-mode=temporal``
-        instead of this sub-option.
-
-        0
-            Pick the ``vdpaupp`` video filter default, which corresponds to 3.
-        1
-            Show only first field.
-        2
-            Bob deinterlacing.
-        3
-            Motion-adaptive temporal deinterlacing. May lead to A/V desync
-            with slow video hardware and/or high resolution.
-        4
-            Motion-adaptive temporal deinterlacing with edge-guided spatial
-            interpolation. Needs fast video hardware.
     ``--vo-vdpau-chroma-deint``
         (Deprecated. See note about ``vdpaupp``.)
 
diff --git a/video/out/vo.h b/video/out/vo.h
index 5deb99a6f1..7efec53ba0 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -121,8 +121,6 @@ enum mp_voctrl {
     VOCTRL_GET_DISPLAY_FPS,             // double*
     VOCTRL_GET_HIDPI_SCALE,             // double*
 
-    VOCTRL_GET_PREF_DEINT,              // int*
-
     /* private to vo_gpu */
     VOCTRL_EXTERNAL_RESIZE,
 };
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index b5b936243f..89dde588b6 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -88,7 +88,6 @@ struct vdpctx {
 
     int                                force_yuv;
     struct mp_vdpau_mixer             *video_mixer;
-    int                                deint;
     int                                pullup;
     float                              denoise;
     float                              sharpen;
@@ -1080,9 +1079,6 @@ static int control(struct vo *vo, uint32_t request, void *data)
             return false;
         *(struct mp_image **)data = get_window_screenshot(vo);
         return true;
-    case VOCTRL_GET_PREF_DEINT:
-        *(int *)data = vc->deint;
-        return true;
     }
 
     int events = 0;
@@ -1115,7 +1111,6 @@ const struct vo_driver video_out_vdpau = {
     .uninit = uninit,
     .priv_size = sizeof(struct vdpctx),
     .options = (const struct m_option []){
-        {"deint", OPT_INT(deint), M_RANGE(-4, 4)},
         {"chroma-deint", OPT_FLAG(chroma_deint), OPTDEF_INT(1)},
         {"pullup", OPT_FLAG(pullup)},
         {"denoise", OPT_FLOAT(denoise), M_RANGE(0, 1)},