diff options
| author | wm4 <wm4@nowhere> | 2013-06-04 00:29:29 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-04 00:29:44 +0200 |
| commit | 92ae48db0f91fbfcfbb1722fa81c922808f62d5a (patch) | |
| tree | e32fe21b5f8c11ada7788768a76e2d9f7d061c66 /demux/stheader.h | |
| parent | daf8ed831b4ae63cf0931cc3d6727956137f865f (diff) | |
| parent | c1ac97b99b3e80bbf84ed540178dd6689ead0b87 (diff) | |
| download | mpv-92ae48db0f91fbfcfbb1722fa81c922808f62d5a.tar.bz2 mpv-92ae48db0f91fbfcfbb1722fa81c922808f62d5a.tar.xz | |
Merge branch 'sub_mess'
This branch heavily refactors the subtitle code (both loading and
rendering), and adds support for a few new formats through FFmpeg.
We don't remove any of the old code yet. There are still some subtleties
related to subreader.c to be resolved: code page detection & conversion,
timing post-processing, UTF-16 subtitle support, support for the -subfps
option. Also, SRT reading and loading ASS via libass should be turned
into proper demuxers. (SRT is needed because Libav's is gravely broken,
and we want ASS loading via libass to cover full libass format support.
Both should be demuxers which are probed _before_ libavformat, so that
all subtitles can be loaded through the demuxer infrastructure, and
libavformat subtitles don't need to be treated in a special way.)
Diffstat (limited to 'demux/stheader.h')
| -rw-r--r-- | demux/stheader.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index 433dc7ef71..421dfaf857 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -161,10 +161,11 @@ typedef struct sh_video { typedef struct sh_sub { SH_COMMON - bool active; // after track switch decoder may stay initialized, not active unsigned char *extradata; // extra header data passed from demuxer int extradata_len; - const struct sd_functions *sd_driver; + struct ass_track *track; // loaded by libass + struct sub_data *sub_data; // loaded by subreader.c + struct dec_sub *dec_sub; // decoder context } sh_sub_t; // demuxer.c: |