diff options
| author | wm4 <wm4@nowhere> | 2015-12-26 18:32:27 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-12-26 18:32:27 +0100 |
| commit | ce8524cb479f3b3339c6d2b3e0f5a45051145204 (patch) | |
| tree | f82095783f5762c3229f6d7b71a029b794bf1efa /demux | |
| parent | 504286b00689ad2c436bdd230b5a63cd66ba8cd6 (diff) | |
| download | mpv-ce8524cb479f3b3339c6d2b3e0f5a45051145204.tar.bz2 mpv-ce8524cb479f3b3339c6d2b3e0f5a45051145204.tar.xz | |
sub: cache subtitle state per track instead of per demuxer stream
Since commit 6d9cb893, subtitle state doesn't survive timeline switches
(ordered chapters etc.). So there is no point in caching the state per
sh_stream anymore (which would be required to deal with multiple
segments). Move the cache to struct track.
(Whether it's worth caching the subtitle state just for the situation
when subtitle tracks get reselected is questionable. But for now, it's
nice to have the subtitles immediately show up when reselecting a
subtitle.)
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/stheader.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index e325b52bf1..8568503f70 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -94,7 +94,6 @@ typedef struct sh_sub { double frame_based; // timestamps are frame-based (and this is the // fallback framerate used for timestamps) char *charset; // assumed 8 bit subtitle charset (can be NULL) - struct dec_sub *dec_sub; // decoder context } sh_sub_t; #endif /* MPLAYER_STHEADER_H */ |