Skip to content
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

Load all external streams #5192

Merged
merged 3 commits into from Dec 8, 2017
Merged

Load all external streams #5192

merged 3 commits into from Dec 8, 2017

Conversation

ghost
Copy link

@ghost ghost commented Dec 7, 2017

No description provided.

wm4 added 3 commits December 7, 2017 10:20
It appears libavformat never sets the file start time for subtitles, so
this special check is not needed. The original idea was probably that
_if_ the demuxer set the start time to the first subtitle packet, the
subtitles would be shifted incorrectly.
Until now, using --sub-file would add only subtitle tracks from the
given file. (E.g. if you passed a video file, only the subtitle tracks
from it were added, not the video or audio tracks.)

This is slightly messy (because streams are hidden), and users don't
even want it, as shown by #5132. Change it to always add all streams.
But if there's no stream of the wanted type, we still report an error
and do not add any streams. It's also made sure none of the other track
types are autoselected.

Also adjust the error messages on load failure slightly.

Fixes #5132.
This was a bit confused, and I bet nobody understood whether to use
--sub-file or --sub-files, and what the difference is. Explicitly
mention that both variants exist, and how they are related.
@pigoz
Copy link
Member

pigoz commented Dec 7, 2017

do you want push access? it's rather incovenient for me to push the merge button in github

@ghost
Copy link
Author

ghost commented Dec 8, 2017

No, sorry for the inconvenience.

@kevmitch kevmitch merged commit 3c62a20 into mpv-player:master Dec 8, 2017
@kevmitch
Copy link
Member

kevmitch commented Dec 8, 2017

works for me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants