[MPlayer-cvslog] r20498 - trunk/mplayer.c

uau subversion at mplayerhq.hu
Sun Oct 29 02:23:12 CEST 2006

Author: uau
Date: Sun Oct 29 02:23:12 2006
New Revision: 20498


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

Modified: trunk/mplayer.c
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Sun Oct 29 02:23:12 2006
@@ -3110,7 +3110,7 @@
 #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);

More information about the MPlayer-cvslog mailing list