diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-10-06 04:28:59 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-10-06 04:48:00 +0300 |
| commit | 7fd3eb0f74e7986e07556077ed654bad7869add8 (patch) | |
| tree | 8d293145c0ef2bc31ca63f79dccb4e3b57294c82 /libmpdemux/demux_ts.c | |
| parent | ef438b3a6b5bc714d521dd46d3ccb798ecd31eed (diff) | |
| parent | cbbc886820e981f488660708678f528e1d243121 (diff) | |
| download | mpv-7fd3eb0f74e7986e07556077ed654bad7869add8.tar.bz2 mpv-7fd3eb0f74e7986e07556077ed654bad7869add8.tar.xz | |
Merge svn changes up to r29752
As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.
Diffstat (limited to 'libmpdemux/demux_ts.c')
| -rw-r--r-- | libmpdemux/demux_ts.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 109275a7fa..c7966da9ba 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -2521,6 +2521,7 @@ static int parse_pmt(ts_priv_t * priv, uint16_t progid, uint16_t pid, int is_sta break; case 0x8A: case 0x82: + case 0x85: case 0x86: pmt->es[idx].type = AUDIO_DTS; break; |