diff options
author | wm4 <wm4@nowhere> | 2015-02-18 21:10:43 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-02-18 21:12:57 +0100 |
commit | 102946ee0358924f22477435114785bd1f901ade (patch) | |
tree | 041231408c3ae32bee50902f700d68dd4fea55eb /player/sub.c | |
parent | 37a0c9140ad85be8d184b626759f8d24ca69aa83 (diff) | |
download | mpv-102946ee0358924f22477435114785bd1f901ade.tar.bz2 mpv-102946ee0358924f22477435114785bd1f901ade.tar.xz |
player: enable cache and demuxer thread for subtitles too
Includes some logic for not starting the demuxer thread for fully read
subtitles. (Well, the cache will still waste _lots_ of resources, and
the cache always has to be created, because we don't know whether it'll
be needed _before_ opening the file.)
See #1597.
Diffstat (limited to 'player/sub.c')
-rw-r--r-- | player/sub.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/player/sub.c b/player/sub.c index 16affc4448..f4c9e7822b 100644 --- a/player/sub.c +++ b/player/sub.c @@ -321,6 +321,8 @@ static void reinit_subdec(struct MPContext *mpctx, struct track *track, if (!track->preloaded && track->is_external && !opts->sub_clear_on_seek) { demux_seek(track->demuxer, 0, SEEK_ABSOLUTE); track->preloaded = sub_read_all_packets(dec_sub, track->stream); + if (track->preloaded) + demux_stop_thread(track->demuxer); } } |