modules/hw/amf/amf_helper.c

@@ -21,12 +21,12 @@ int vlc_AMFCreateContext(struct vlc_amf_context *c)
     if (hLib == NULL)
         return (-ENOTSUP);
 
-    amf_uint64 version = 0;
+    c->Version = 0;
     AMF_RESULT res;
     AMFQueryVersion_Fn queryVersion = (AMFQueryVersion_Fn)GetProcAddress(hLib, AMF_QUERY_VERSION_FUNCTION_NAME);
     if (unlikely(queryVersion == NULL))
         goto error;
-    res = queryVersion(&version);
+    res = queryVersion(&c->Version);
     if (unlikely(res != AMF_OK))
         goto error;
 
@@ -34,7 +34,7 @@ int vlc_AMFCreateContext(struct vlc_amf_context *c)
     c->Context = NULL;
 
     AMFInit_Fn init = (AMFInit_Fn)GetProcAddress(hLib, AMF_INIT_FUNCTION_NAME);
-    res = init(version, &c->pFactory);
+    res = init(c->Version, &c->pFactory); // use the highest possible value for that DLL
     if (unlikely(res != AMF_OK))
         goto error;
 

modules/hw/amf/amf_helper.h

@@ -29,6 +29,7 @@ struct vlc_amf_context
 {
     AMT_TYPE(AMFFactory) *pFactory;
     AMT_TYPE(AMFContext) *Context;
+    amf_uint64           Version;
     void            *Private;
 };
 

modules/video_filter/amf_vqenhancer.c

@@ -175,6 +175,14 @@ int D3D11CreateAMFVQE(vlc_object_t *p_this)
         return VLC_ENOOBJ;
     }
 
+    struct filter_sys_t *dev_sys = sys;
+
+    if (dev_sys->d3d_dev.adapterDesc.VendorId != GPU_MANUFACTURER_AMD)
+    {
+        msg_Err(filter, "AMF filter only supported with AMD GPUs");
+        goto error;
+    }
+
     DXGI_FORMAT input_format = dstDesc.Format;
     const d3d_format_t *cfg;
     for (cfg = GetRenderFormatList(); cfg->name != NULL; ++cfg)
@@ -192,8 +200,6 @@ int D3D11CreateAMFVQE(vlc_object_t *p_this)
         return VLC_EGENERIC;
     }
 
-    struct filter_sys_t *dev_sys = sys;
-
     HRESULT hr;
     HANDLE context_lock = INVALID_HANDLE_VALUE;
     UINT dataSize = sizeof(context_lock);