Skip to content

Commit

Permalink
[ffmpeg] mp3lame dependency doesn't need default-feature of 'frontend'
Browse files Browse the repository at this point in the history
  • Loading branch information
derekcyruschow-catapult committed Jul 18, 2024
1 parent a360b13 commit d68190e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
7 changes: 5 additions & 2 deletions ports/ffmpeg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "6.1.1",
"port-version": 11,
"port-version": 12,
"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 @@ -457,7 +457,10 @@
"mp3lame": {
"description": "MP3 encoding via libmp3lame",
"dependencies": [
"mp3lame"
{
"name": "mp3lame",
"default-features": false
}
]
},
"nonfree": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2694,7 +2694,7 @@
},
"ffmpeg": {
"baseline": "6.1.1",
"port-version": 11
"port-version": 12
},
"ffnvcodec": {
"baseline": "12.1.14.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": "383f650dc261478b47b057e8fe06725398608d55",
"version": "6.1.1",
"port-version": 12
},
{
"git-tree": "15b90b33b76e69c2d9b876b32c4c9b47c97846ed",
"version": "6.1.1",
Expand Down

0 comments on commit d68190e

Please sign in to comment.