Merge 4.7.4 into 4.7.0-as2#4425
Draft
KimmyWFox wants to merge 247 commits into
Draft
Conversation
Changed the link text for the v2.0 migration documentation
"here" links are evil
Contributor
|
Here's an alternative view of this change, which hopefully shows what it would look like to apply adaptation set switching support to the current tip of |
Author
|
The merge fails on adaptation set switching. Need redo the merging. |
…l changes to existing ABR rules
… highest quality when setting buffer target
…ferently in 5.0.0
…out waiting for session.close promise to be resolved.
# Conflicts: # package.json # src/dash/controllers/RepresentationController.js
# Conflicts: # package.json # src/streaming/protection/models/ProtectionModel_21Jan2015.js
# Conflicts: # package.json # src/streaming/rules/abr/AbandonRequestsRule.js
# Conflicts: # package.json
576d242 to
4eae0a9
Compare
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
20 participants
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.
Merge current
masterbranch at version 4.7.4 into branchfeature/adaptation-set-switching