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/stheader.h | |
| 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/stheader.h')
| -rw-r--r-- | demux/stheader.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index 2fe1ac40c5..47dcf7a207 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -171,7 +171,6 @@ typedef struct sh_video { typedef struct sh_sub { SH_COMMON - char type; // t = text, v = VobSub, a = SSA/ASS, m, x, b, d, p bool active; // after track switch decoder may stay initialized, not active unsigned char *extradata; // extra header data passed from demuxer int extradata_len; @@ -189,8 +188,6 @@ struct sh_sub *new_sh_sub_sid_lang(struct demuxer *demuxer, int id, int sid, const char *lang); struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type); -const char *sh_sub_type2str(int type); - // video.c: int video_read_properties(struct sh_video *sh_video); int video_read_frame(struct sh_video *sh_video, float *frame_time_ptr, |