From a993cdc48156e0bcf10d90880d77a35ac0b9feaa Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 17 Mar 2016 09:47:09 +0100 Subject: dxva2: prevent outputting native surfaces with HWDEC_DXVA2_COPY (again) Not quite sure when/why exactly this was broken. --- video/decode/dxva2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'video/decode') diff --git a/video/decode/dxva2.c b/video/decode/dxva2.c index d4ce0c72b3..d255cb7b1a 100644 --- a/video/decode/dxva2.c +++ b/video/decode/dxva2.c @@ -629,7 +629,8 @@ static int probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info, hwdec_request_api(info, "dxva2"); // dxva2-copy can do without external context; dxva2 requires it. if (hwdec->type != HWDEC_DXVA2_COPY) { - if (!info || !info->hwctx || !info->hwctx->d3d_ctx) + if (!info || !info->hwctx || !info->hwctx->d3d_ctx || + info->hwctx->type == HWDEC_DXVA2_COPY) return HWDEC_ERR_NO_CTX; } for (int i = 0; dxva2_modes[i].guid; i++) { -- cgit v1.2.3