fix: Cherry-pick keySession fix, Video.js 8 refactor, and jsdoc update commits from main branch #179
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
alex-barstow
changed the title
| const fn = context.merge || context.mergeOptions; | ||
|
|
||
| return fn.apply(context, args); | ||
| }; |
|
Changes LGTM, but tests are failing. |
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
There is a bug in 4.x+ where Fairplay tends to fail. It has something to do with the change that added support for in-spec EME in Safari.
We will work on diagnosing that issue, but in the meantime we can tag off the
3.xbranch before the problem was introduced. There were a few changes in #main, included in this PR, that we wanted to get released promptly.