path: root/sub/ass_mp.h
diff options
authorUoti Urpala <>2012-08-25 21:22:39 +0300
committerwm4 <wm4@nowhere>2012-09-18 21:04:46 +0200
commit89a57148934ec7f150a6170ac1313f6f5c636596 (patch)
treeacff6dbda4ea8623ea4ce4d86834fe74f015653e /sub/ass_mp.h
parent9bb03b7db40408b9dc4a0e1405a5bac754893e2b (diff)
subs: always use sub decoder framework for libass rendering
Remove subtitle selection code setting osd->ass_track directly and vf_ass/vf_vo code rendering the track directly with libass. Instead, do track selection and rendering with dec_sub.c functions. Before, mpctx->set_of_ass_tracks[] contained bare libass tracks generated from external subtitle files. For use with dec_sub.c, it now contains struct sh_sub instances with decoder already initialized. This commit breaks the sub_step command ('g' and 'y' keys) for libass-rendered subtitles. It could be fixed, but it's so useless - especially as with the existing implementation there's no practical way to get subtitle delay back to normal after using it - that I didn't bother. Conflicts: command.c mp_core.h mplayer.c
Diffstat (limited to 'sub/ass_mp.h')
1 files changed, 0 insertions, 6 deletions
diff --git a/sub/ass_mp.h b/sub/ass_mp.h
index 095cf4311d..3cfbe147b7 100644
--- a/sub/ass_mp.h
+++ b/sub/ass_mp.h
@@ -61,10 +61,4 @@ typedef struct ass_image {
-typedef struct {
- ASS_Image *imgs;
- int changed;
-} mp_eosd_images_t;
#endif /* MPLAYER_ASS_MP_H */