From 86689f7bf23dd05b5e6b9e42e43379d52e27c338 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 15 Mar 2014 22:17:51 +0100 Subject: 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. --- demux/stheader.h | 1 - 1 file changed, 1 deletion(-) (limited to 'demux/stheader.h') 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; -- cgit v1.2.3