diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 1b677396ee..541f1da0c8 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -66,8 +66,8 @@ if("opencl" IN_LIST FEATURES)
 endif()
 
 if("opengl" IN_LIST FEATURES)
-    if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX)
-        message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm) | osx'")
+    if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP)
+        message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm)")
     endif()
 endif()
 
diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index efdb888bf1..958d569649 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4",
-  "port-version": 8,
+  "port-version": 9,
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
     "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
@@ -118,6 +118,14 @@
           ],
           "platform": "!(uwp | arm) & !static"
         },
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "opengl"
+          ],
+          "platform": "!uwp & !(windows & arm)"
+        },
         {
           "name": "ffmpeg",
           "default-features": false,
@@ -142,14 +150,6 @@
           ],
           "platform": "!(x86 | arm | uwp) & !static"
         },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "opengl"
-          ],
-          "platform": "!uwp & !(windows & arm) & !osx"
-        },
         {
           "name": "ffmpeg",
           "default-features": false,
diff --git a/versions/baseline.json b/versions/baseline.json
index a25491dbf6..a58944d606 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1990,7 +1990,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4",
-      "port-version": 8
+      "port-version": 9
     },
     "ffnvcodec": {
       "baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 04750b6afa..0c863b4044 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b118bc2a5cf855546dc3016de53c4d7c75d267b4",
+      "version": "4.4",
+      "port-version": 9
+    },
     {
       "git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b",
       "version": "4.4",