-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update FFMpeg to 7.1 #57
Draft
mike-malburg
wants to merge
13
commits into
main
Choose a base branch
from
update/ffmpeg7.1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
+935
−311
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mike-malburg
force-pushed
the
update/ffmpeg7.1
branch
from
November 18, 2024 18:34
4b6ed79
to
7e165c8
Compare
mike-malburg
force-pushed
the
update/ffmpeg7.1
branch
from
November 18, 2024 18:54
7e165c8
to
67584ea
Compare
Version infoThis is where I found the version info for all of these
|
mike-malburg
force-pushed
the
update/ffmpeg7.1
branch
2 times, most recently
from
November 20, 2024 01:05
dc39ff1
to
eb8d423
Compare
mike-malburg
force-pushed
the
update/ffmpeg7.1
branch
from
November 20, 2024 18:54
336baf7
to
3ef58d9
Compare
mike-malburg
force-pushed
the
update/ffmpeg7.1
branch
2 times, most recently
from
November 21, 2024 21:31
431f03c
to
583a2b2
Compare
mike-malburg
force-pushed
the
update/ffmpeg7.1
branch
2 times, most recently
from
December 6, 2024 15:19
e47252c
to
48e6b83
Compare
mike-malburg
force-pushed
the
update/ffmpeg7.1
branch
3 times, most recently
from
January 10, 2025 15:07
beb1436
to
4d9e99e
Compare
Modified cherry-pick from: e8d2b46
Modified cherry-pick commit: 16b3a42
- Updated vcpkgHash to b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c (FFMpeg 7.1) - Updated features for mac and windows builds to include WEBM support-related libs, some AV1 support, the ffmpeg command-line tool, and opencl support: +dav1d,opus,vpx,vorbis,aom,ffmpeg,opencl
- Copy tools dir for Mac during pre-stage - Add support to finalize artifacts for exes and items in other dirs - Add ability to optionally NOT delete the prestage dir (for easier debugging) - Only copy non-library files if they don't already exist
- Made changes to better share build flags between mac, windows, and wasm builds - Removed some redundant items from wasm build options - Added in specific encoders, decoders, muxers, and demuxers for Mac and Windows builds. - Moved wasm custom part inside of <Additional custom TechSmith options>
I also added a change to fail the build if the post-build step fails (Build.psm1 change). This will prevent us from publishing a version of ffmpeg that failed tests in the post-build stage.
mike-malburg
force-pushed
the
update/ffmpeg7.1
branch
from
January 10, 2025 22:50
127aba4
to
cb92460
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR does a few things:
Additional information
I have compiled a list of all possible encoders, decoders, muxers, demuxers and hardware acceleration options for Mac and Windows, here: https://docs.google.com/spreadsheets/d/17WNJ4AV64cQ6WknwHISiAthUyi-ispRM0qWF_ZtnMrw/edit?gid=1133251722#gid=1133251722
Testing
1.) Verify only the expected encoders, decoders, muxers and demuxers are enabled (Windows)
tools/ffmpeg
folder2.) Verify only the expected encoders, decoders, muxers and demuxers are enabled (Mac)
tools/ffmpeg
folder3.) Verify you can encode to the appropriate formats (Windows)
tools/ffmpeg
folderencoded
folder4.) Verify you can encode to the appropriate formats (Mac)
tools/ffmpeg
folderencoded
folder5.) Verify you can decode the appropriate formats (Windows)
tools/ffmpeg
folderdecoded
folder6.) Verify you can decode the appropriate formats (Mac)
tools/ffmpeg
folderdecoded
folder7.) Verify file versions are set (Windows)
bin
folder