Skip to content

Commit

Permalink
[ffmpeg] use fdk-aac[he-aac] for fdk-aac feature
Browse files Browse the repository at this point in the history
There is no point to this feature without HE-AAC because FFmpeg has
its own AAC codec that does not support HE-AAC.
  • Loading branch information
Be-ing committed Aug 3, 2021
1 parent 15aaec2 commit 9a8bddb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
12 changes: 9 additions & 3 deletions ports/ffmpeg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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."
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1998,7 +1998,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 12
"port-version": 13
},
"ffnvcodec": {
"baseline": "10.0.26.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/ffmpeg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "26e3d87d6b3049b45355f36a34402b938d5b486d",
"version": "4.4",
"port-version": 13
},
{
"git-tree": "4d910207840ec65730eb972e472dab548fb8b5d2",
"version": "4.4",
Expand Down

0 comments on commit 9a8bddb

Please sign in to comment.