vdpau: fix vaapi probing if libvdpau-va-gl1 is present

Needs explicit logic. Fixes a pretty bad regression which prefers
vdpau-copy over native vaapi with direct rendering (with --hwdec=auto)
if libvdpau-va-gl1 is present. The reason is that vdpau-copy is above
vaapi, simply because all vdpau hwdecs are grouped and happened to be
listed before vaapi.

Although this is not that bad for copy-mode (unlike the case described
above), it's still a good idea to use our native vaapi code instead.

1 files changed, 7 insertions, 5 deletions

diff --git a/video/decode/vdpau.c b/video/decode/vdpau.c
index 93a1e6d9a3..a6b6210804 100644
--- a/video/decode/vdpau.c
+++ b/video/decode/vdpau.c
@@ -146,12 +146,14 @@ static int probe_copy(struct lavc_ctx *ctx, struct vd_lavc_hwdec *hwdec,
                       const char *codec)
 {
     assert(!ctx->hwdec_priv);
-    int r = init_copy(ctx);
-    if (ctx->hwdec_priv)
-        uninit(ctx);
-    ctx->hwdec_priv = NULL;
 
-    return r < 0 ? HWDEC_ERR_NO_CTX : 0;
+    int r = HWDEC_ERR_NO_CTX;
+    if (init_copy(ctx) >=0 ) {
+        struct priv *p = ctx->hwdec_priv;
+        r = mp_vdpau_guess_if_emulated(p->mpvdp) ? HWDEC_ERR_EMULATED : 0;
+        uninit(ctx);
+    }
+    return r;
 }
 
 static struct mp_image *copy_image(struct lavc_ctx *ctx, struct mp_image *img)