summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-09-03 13:47:56 +0300
committerUoti Urpala <uau@mplayer2.org>2011-09-03 14:26:14 +0300
commit83fc5b60046b12227540f77969b5c1aa29107bad (patch)
treef72bbea73524a7b9005e3c935fafe1f20bd43991 /mplayer.c
parent3e0a2705595cbf991e0428984052488ad94c6d21 (diff)
downloadmpv-83fc5b60046b12227540f77969b5c1aa29107bad.tar.bz2
mpv-83fc5b60046b12227540f77969b5c1aa29107bad.tar.xz
options: move libass-related options to struct
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mplayer.c b/mplayer.c
index 55d81627bb..a3e8c9b5df 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1134,7 +1134,7 @@ void add_subtitles(struct MPContext *mpctx, char *filename, float fps,
if (!asst) {
subd = sub_read_file(filename, fps, &mpctx->opts);
if (subd) {
- asst = mp_ass_read_subdata(mpctx->ass_library, subd, fps);
+ asst = mp_ass_read_subdata(mpctx->ass_library, opts, subd, fps);
sub_free(subd);
subd = NULL;
}
@@ -4178,7 +4178,7 @@ int main(int argc, char *argv[])
#endif
#ifdef CONFIG_ASS
- mpctx->ass_library = mp_ass_init();
+ mpctx->ass_library = mp_ass_init(opts);
mpctx->osd->ass_library = mpctx->ass_library;
#endif
@@ -4688,7 +4688,7 @@ goto_enable_cache:
struct demuxer *d = mpctx->sources[j].demuxer;
for (int i = 0; i < d->num_attachments; i++) {
struct demux_attachment *att = d->attachments + i;
- if (use_embedded_fonts && attachment_is_font(att))
+ if (opts->use_embedded_fonts && attachment_is_font(att))
ass_add_font(mpctx->ass_library, att->name, att->data,
att->data_size);
}