diff options
author | wm4 <wm4@nowhere> | 2014-03-15 22:17:51 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-03-15 22:17:51 +0100 |
commit | 86689f7bf23dd05b5e6b9e42e43379d52e27c338 (patch) | |
tree | 05040ae3532ec9718e320b69a11d97264935f83b /demux/stheader.h | |
parent | f6b4f60264000ab16459639063cdfae64c3db942 (diff) | |
download | mpv-86689f7bf23dd05b5e6b9e42e43379d52e27c338.tar.bz2 mpv-86689f7bf23dd05b5e6b9e42e43379d52e27c338.tar.xz |
demux_libass: change how external ASS subtitles are loaded
Instead of parsing the ASS file in demux_libass.c and trying to pass the
ASS_Track to the subtitle renderer, just read all file data in
demux_libass.c, and let the subtitle renderer pass the file contents to
ass_process_codec_private(). (This happens to parse full files too.)
Makes the code simpler, though it also relies harder on the (messy)
probe logic in demux_libass.c.
Diffstat (limited to 'demux/stheader.h')
-rw-r--r-- | demux/stheader.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index 573d6ac3c6..2940dc6a4d 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -91,7 +91,6 @@ typedef struct sh_sub { double frame_based; // timestamps are frame-based (and this is the // fallback framerate used for timestamps) bool is_utf8; // if false, subtitle packet charset is unknown - struct ass_track *track; // loaded by libass struct dec_sub *dec_sub; // decoder context } sh_sub_t; |