diff options
| author | wm4 <wm4@nowhere> | 2013-04-15 21:25:21 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-20 23:28:27 +0200 |
| commit | 331982b99ce3b50b95ac340eb17c6116913480f3 (patch) | |
| tree | b0e0c14521f509a883c0420d9e6277c0329eb773 /demux/demux_ts.c | |
| parent | 5ac50f88c90167e9ade0c998ac62e935e259acee (diff) | |
| download | mpv-331982b99ce3b50b95ac340eb17c6116913480f3.tar.bz2 mpv-331982b99ce3b50b95ac340eb17c6116913480f3.tar.xz | |
sub, demux: identify subtitle types with the codec name
Get rid of the 1-char subtitle type field. Use sh_stream->codec instead
just like audio and video do. Use codec names as defined by libavcodec
for simplicity, even if they're somewhat verbose and annoying.
Note that ffmpeg might switch to "ass" as codec name for ASS, so we
don't bother with the current silly "ssa" name.
Diffstat (limited to 'demux/demux_ts.c')
| -rw-r--r-- | demux/demux_ts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demux/demux_ts.c b/demux/demux_ts.c index ac23f0e71b..6d41dfd939 100644 --- a/demux/demux_ts.c +++ b/demux/demux_ts.c @@ -415,11 +415,11 @@ static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es) if (sh) { switch (es->type) { case SPU_DVB: - sh->type = 'b'; break; + sh->gsh->codec = "dvb_subtitle"; break; case SPU_DVD: - sh->type = 'v'; break; + sh->gsh->codec = "dvd_subtitle"; break; case SPU_PGS: - sh->type = 'p'; break; + sh->gsh->codec = "hdmv_pgs_subtitle"; break; } priv->ts.streams[es->pid].id = priv->last_sid; priv->ts.streams[es->pid].sh = sh; |