summaryrefslogtreecommitdiffstats
path: root/video/out/vo.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-06 15:27:44 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:39:32 +0100
commit2d8fb838d7823137661b420b98e68188532bb36f (patch)
treee9d3742a0428a0dccc2cff894d89c6fad1d11a0c /video/out/vo.h
parent0d1aca12896b6459d0a1c41fcac5b67bf5351817 (diff)
downloadmpv-2d8fb838d7823137661b420b98e68188532bb36f.tar.bz2
mpv-2d8fb838d7823137661b420b98e68188532bb36f.tar.xz
video: make vdpau hardware decoding not use DR code path
vdpau hardware decoding used the DR (direct rendering) path to let the decoder query a surface from the VO. Special-case the HW decoding path instead, to make it separate from DR.
Diffstat (limited to 'video/out/vo.h')
-rw-r--r--video/out/vo.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/vo.h b/video/out/vo.h
index bcc751e5f2..7b929f985d 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -44,8 +44,7 @@ enum mp_voctrl {
VOCTRL_PAUSE,
/* start/resume playback */
VOCTRL_RESUME,
- /* libmpcodecs direct rendering */
- VOCTRL_GET_IMAGE,
+
VOCTRL_GET_PANSCAN,
VOCTRL_SET_PANSCAN,
VOCTRL_SET_EQUALIZER, // struct voctrl_set_equalizer_args
@@ -54,6 +53,7 @@ enum mp_voctrl {
/* for vdpau hardware decoding */
VOCTRL_HWDEC_DECODER_RENDER, // pointer to hw state
+ VOCTRL_HWDEC_GET_SURFACE, // struct mp_image
VOCTRL_NEWFRAME,
VOCTRL_SKIPFRAME,