summaryrefslogtreecommitdiffstats
path: root/sub/sd.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-15 22:17:51 +0100
committerwm4 <wm4@nowhere>2014-03-15 22:17:51 +0100
commit86689f7bf23dd05b5e6b9e42e43379d52e27c338 (patch)
tree05040ae3532ec9718e320b69a11d97264935f83b /sub/sd.h
parentf6b4f60264000ab16459639063cdfae64c3db942 (diff)
downloadmpv-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 'sub/sd.h')
-rw-r--r--sub/sd.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sub/sd.h b/sub/sd.h
index 78b9825ead..3f348fcb32 100644
--- a/sub/sd.h
+++ b/sub/sd.h
@@ -28,9 +28,6 @@ struct sd {
// Resolution hints stored in mp4 files.
int sub_stream_w, sub_stream_h;
- // Make sd_ass use an existing track
- struct ass_track *ass_track;
-
// Shared renderer for ASS - done to avoid reloading embedded fonts.
struct ass_library *ass_library;
struct ass_renderer *ass_renderer;