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.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.c')
| -rw-r--r-- | demux/demux.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/demux/demux.c b/demux/demux.c index c23185c90b..b3cb078dcb 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -241,21 +241,6 @@ demuxer_t *new_demuxer(struct MPOpts *opts, stream_t *stream, int type, return d; } -const char *sh_sub_type2str(int type) -{ - switch (type) { - case 't': return "text"; - case 'm': return "movtext"; - case 'a': return "ass"; - case 'v': return "vobsub"; - case 'x': return "xsub"; - case 'b': return "dvb"; - case 'd': return "dvb-teletext"; - case 'p': return "hdmv pgs"; - } - return "unknown"; -} - static struct sh_stream *new_sh_stream_id(demuxer_t *demuxer, enum stream_type type, int stream_index, |