Add MKV container support for H.264 and H.265#9
Open
graemeg wants to merge 2 commits into
Open
Conversation
The upstream meson-ports/ffmpeg meson-7.1 branch diverged, breaking patch application in two ways: - libavcodec_optional_deps changed from a single line to a multi-line block, causing hunk nowrep#2 to fail entirely. - A bug in the new branch causes a crash when vaapi=enabled and xlib=disabled: the precondition loop calls conf.get(precondition) without a default, but xlib_x11 is never added to conf when xlib is disabled. Fixed by using conf.get(precondition, 0) consistently.
The container list only advertised mp4 and mov, which prevented the host app from offering mkv as an output container for H.264/H.265. Adding mkv to the list is sufficient because the existing non-mp4 branch in DoOpen already passes raw Annex B extradata unchanged, which is the correct format for Matroska.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #4.
The container list in
RegisterCodecsonly advertisedmp4andmov, which prevented the host app from offering MKV as an output container for H.264 and H.265 (it was already working for AV1 via the same path).Adding
mkvto the container list is sufficient because the existing non-mp4 branch inDoOpenalready passes raw Annex B extradata unchanged — which is the correct format for Matroska, so no additional conversion logic is needed.Also includes a fix to
ffmpeg-vaapi.patchfor compatibility with the updated meson-7.1 branch.