-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
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
Config: Error when both HLS and HTTP-TS enabled. #3400
Merged
winlinvip
merged 7 commits into
ossrs:develop
from
chundonglinlin:feature/detect-conflict-hls-remux
Feb 8, 2023
Merged
Config: Error when both HLS and HTTP-TS enabled. #3400
winlinvip
merged 7 commits into
ossrs:develop
from
chundonglinlin:feature/detect-conflict-hls-remux
Feb 8, 2023
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
xiaozhihong
approved these changes
Feb 3, 2023
winlinvip
reviewed
Feb 7, 2023
…nglinlin/srs into feature/detect-conflict-hls-remux
1c2c1a2
to
49430dd
Compare
49430dd
to
f2ccac1
Compare
winlinvip
approved these changes
Feb 8, 2023
winlinvip
added a commit
that referenced
this pull request
Feb 8, 2023
PICK 5b001fe Co-authored-by: winlin <[email protected]> Co-authored-by: john <[email protected]>
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.
If enable HLS and HTTP-TS, SRS can't identify the protocol(HLS or HTTP-TS). So when SRS start, we detect the conflict for HLS and HTTP-TS.
Test1
Test2
Test3
Test4
Test5