video: make vdpau hardware decoding not use slices code path

For some reason, libavcodec abuses the slices rendering code path for
hardware decoding: in that case, the only purpose of the draw callback
is to pass a vdpau video surface object to video output. (It is unclear
to me why this had to use the slices code, instead of just returning an
AVFrame with the required vdpau state.)

Make this code separate within mpv, so that the internal slices code
path is not used for hardware decoding. Pass the vdpau state with
VOCTRL_HWDEC_DECODER_RENDER instead.

Remove the mencoder specific VOCTRLs.

2 files changed, 3 insertions, 3 deletions

diff --git a/video/filter/vf.h b/video/filter/vf.h
index 8f20b20466..f470bdc3b9 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -100,9 +100,7 @@ struct vf_ctrl_screenshot {
 #define VFCTRL_SET_PP_LEVEL 5       // set postprocessing level
 #define VFCTRL_SET_EQUALIZER 6 // set color options (brightness,contrast etc)
 #define VFCTRL_GET_EQUALIZER 8 // get color options (brightness,contrast etc)
-#define VFCTRL_DUPLICATE_FRAME 11  // For encoding - encode zero-change frame
-#define VFCTRL_SKIP_NEXT_FRAME 12  // For encoding - drop the next frame that passes thru
-#define VFCTRL_FLUSH_FRAMES    13  // For encoding - flush delayed frames
+#define VFCTRL_HWDEC_DECODER_RENDER 9 // vdpau hw decoding
 #define VFCTRL_SCREENSHOT      14  // Take screenshot, arg is vf_ctrl_screenshot
 #define VFCTRL_INIT_OSD        15  // Filter OSD renderer present?
 #define VFCTRL_SET_DEINTERLACE 18  // Set deinterlacing status
diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c
index f1931126f3..8fe30bf415 100644
--- a/video/filter/vf_vo.c
+++ b/video/filter/vf_vo.c
@@ -107,6 +107,8 @@ static int control(struct vf_instance *vf, int request, void *data)
         };
         return vo_control(video_out, VOCTRL_GET_EQUALIZER, &param) == VO_TRUE;
     }
+    case VFCTRL_HWDEC_DECODER_RENDER:
+        return vo_control(video_out, VOCTRL_HWDEC_DECODER_RENDER, data);
     }
     return CONTROL_UNKNOWN;
 }