diff --git a/ports/mfx-dispatch/portfile.cmake b/ports/mfx-dispatch/portfile.cmake
index 6ede033730..693a5650b0 100644
--- a/ports/mfx-dispatch/portfile.cmake
+++ b/ports/mfx-dispatch/portfile.cmake
@@ -1,25 +1,30 @@
 vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO lu-zero/mfx_dispatch
-        REF 1.35.1
-        SHA512 12517338342d3e653043a57e290eb9cffd190aede0c3a3948956f1c7f12f0ea859361cf3e534ab066b96b1c211f68409c67ef21fd6d76b68cc31daef541941b0
-        HEAD_REF master
-        PATCHES
-            fix-unresolved-symbol.patch
-            fix-pkgconf.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lu-zero/mfx_dispatch
+    REF "${VERSION}"
+    SHA512 12517338342d3e653043a57e290eb9cffd190aede0c3a3948956f1c7f12f0ea859361cf3e534ab066b96b1c211f68409c67ef21fd6d76b68cc31daef541941b0
+    HEAD_REF master
+    PATCHES
+        fix-unresolved-symbol.patch
+        fix-pkgconf.patch
 )
 
-set(LIBRARY_TYPE ${VCPKG_LIBRARY_LINKAGE})
-if (LIBRARY_TYPE STREQUAL "dynamic")
-    set(LIBRARY_TYPE "shared")
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    vcpkg_cmake_configure(
+        SOURCE_PATH "${SOURCE_PATH}" 
+    )
+    vcpkg_cmake_install()
+    vcpkg_copy_pdbs()
+else()
+    if(VCPKG_TARGET_IS_MINGW)
+        vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+    endif()
+    vcpkg_configure_make(
+        SOURCE_PATH "${SOURCE_PATH}"
+        AUTOCONFIG
+    )
+    vcpkg_install_make()
 endif()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}" 
-)
-
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
   
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/mfx-dispatch/vcpkg.json b/ports/mfx-dispatch/vcpkg.json
index 505a076b1c..888e39c426 100644
--- a/ports/mfx-dispatch/vcpkg.json
+++ b/ports/mfx-dispatch/vcpkg.json
@@ -1,15 +1,16 @@
 {
   "name": "mfx-dispatch",
   "version": "1.35.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Open source Intel media sdk dispatcher",
   "homepage": "https://github.com/lu-zero/mfx_dispatch",
   "license": "BSD-3-Clause",
-  "supports": "!linux & !uwp & !osx",
+  "supports": "((x86 | x64) & (android | linux)) | (windows & !uwp)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
-      "host": true
+      "host": true,
+      "platform": "windows & !mingw"
     }
   ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 8c900b724c..7bc1a711e4 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -723,9 +723,6 @@ memorymodule:x64-android=fail
 mesa:x64-linux=fail
 mesa:x64-osx=fail
 mesa:arm64-osx=fail
-mfx-dispatch:arm-neon-android=fail
-mfx-dispatch:arm64-android=fail
-mfx-dispatch:x64-android=fail
 milerius-sfml-imgui:x64-windows-static=fail
 minifb:arm-neon-android=fail
 minifb:arm64-android=fail
diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
index f45b6070d2..39fdddd2ca 100644
--- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
@@ -158,6 +158,14 @@
       ],
       "platform": "!uwp & !(arm64 & windows) & !android"
     },
+    {
+      "name": "ffmpeg",
+      "default-features": false,
+      "features": [
+        "qsv"
+      ],
+      "platform": "!arm & (android | linux | windows) & !uwp"
+    },
     {
       "name": "ffmpeg",
       "default-features": false,
diff --git a/versions/baseline.json b/versions/baseline.json
index b8ddb35efa..d8408501df 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5782,7 +5782,7 @@
     },
     "mfx-dispatch": {
       "baseline": "1.35.1",
-      "port-version": 3
+      "port-version": 4
     },
     "mgnlibs": {
       "baseline": "2019-09-29",
diff --git a/versions/m-/mfx-dispatch.json b/versions/m-/mfx-dispatch.json
index 2b6b685767..d1481f3501 100644
--- a/versions/m-/mfx-dispatch.json
+++ b/versions/m-/mfx-dispatch.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0e2d18fc6010dd23044bade1a855669f8e9c9c86",
+      "version": "1.35.1",
+      "port-version": 4
+    },
     {
       "git-tree": "4372c27465a70b6b113adc8fb69ea86da3c21a3f",
       "version": "1.35.1",