summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-29 00:23:12 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-29 00:23:12 +0000
commit4df20148797a9d9217157a6f552db433b56095c6 (patch)
treeb857745d7d526e5cc3deddb6f4b28d8492a241fe /mplayer.c
parentccdc5fda0874441d0bd0696bbf395aa9be4651a5 (diff)
downloadmpv-4df20148797a9d9217157a6f552db433b56095c6.tar.bz2
mpv-4df20148797a9d9217157a6f552db433b56095c6.tar.xz
Always initialize libass to fix crashes caused by use without initialization.
Library init was only done if ass_enabled was true at program startup. However there are at least 2 ways how MPlayer can later try to access the library even if ass_enabled is false at that point: - per-file options can turn on ass support later - if the embeddedfonts option is enabled and the file has fonts demux_mkv will call ass_process_font git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20498 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index f1bb37bd0f..f712dda9ee 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3110,7 +3110,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
vo_init_osd();
#ifdef USE_ASS
-if(ass_enabled) {
+if(1 || ass_enabled) { // even if ass_enabled==0 now it can be used
char* path = get_path("fonts");
ass_library = ass_library_init();
ass_set_fonts_dir(ass_library, path);