diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-08-25 21:22:39 +0300 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:04:46 +0200 |
| commit | 89a57148934ec7f150a6170ac1313f6f5c636596 (patch) | |
| tree | acff6dbda4ea8623ea4ce4d86834fe74f015653e /libvo | |
| parent | 9bb03b7db40408b9dc4a0e1405a5bac754893e2b (diff) | |
| download | mpv-89a57148934ec7f150a6170ac1313f6f5c636596.tar.bz2 mpv-89a57148934ec7f150a6170ac1313f6f5c636596.tar.xz | |
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 'libvo')
| -rw-r--r-- | libvo/eosd_packer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libvo/eosd_packer.h b/libvo/eosd_packer.h index e207a4a2dd..eaacd0223f 100644 --- a/libvo/eosd_packer.h +++ b/libvo/eosd_packer.h @@ -23,6 +23,7 @@ #include <stdbool.h> #include "sub/ass_mp.h" +#include "sub/dec_sub.h" // Pool of surfaces struct eosd_surface { |