From 9a8bddb453e4f3a2d78a5a6367b24e778a80e9cd Mon Sep 17 00:00:00 2001
From: Be <be@mixxx.org>
Date: Sun, 1 Aug 2021 12:45:44 -0500
Subject: [PATCH] [ffmpeg] use fdk-aac[he-aac] for fdk-aac feature

There is no point to this feature without HE-AAC because FFmpeg has
its own AAC codec that does not support HE-AAC.
---
 ports/ffmpeg/vcpkg.json | 12 +++++++++---
 versions/baseline.json  |  2 +-
 versions/f-/ffmpeg.json |  5 +++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index 854bcaf1ab33dd..db07eba9bf53a3 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4",
-  "port-version": 12,
+  "port-version": 13,
   "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."
@@ -299,9 +299,15 @@
       ]
     },
     "fdk-aac": {
-      "description": "AAC de/encoding via libfdk-aac",
+      "description": "AAC de/encoding via libfdk-aac, **including GPL-incompatible patent-encumbered HE-AAC**. If you do not require HE-AAC, use the built-in FFmpeg AAC codec.",
       "dependencies": [
-        "fdk-aac",
+        {
+          "name": "fdk-aac",
+          "default-features": false,
+          "features": [
+            "he-aac"
+          ]
+        },
         {
           "name": "ffmpeg",
           "default-features": false,
diff --git a/versions/baseline.json b/versions/baseline.json
index cee34df59fdd75..3a2492534a17c1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1998,7 +1998,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4",
-      "port-version": 12
+      "port-version": 13
     },
     "ffnvcodec": {
       "baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index df25f3a8269941..d8746e3a67aefb 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "26e3d87d6b3049b45355f36a34402b938d5b486d",
+      "version": "4.4",
+      "port-version": 13
+    },
     {
       "git-tree": "4d910207840ec65730eb972e472dab548fb8b5d2",
       "version": "4.4",