Mercurial > mplayer.hg

diff libass/ass_drawing.c @ 34011:88eebbbbd6a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update included libass copy to 0.9.13 release. Besides a license change to BSD license and other (minor?) fixes, this fixes possible crashes with the latest (2.4.6?) freetype release.
author reimar
date Sun, 11 Sep 2011 10:33:13 +0000
parents 34215c3e6e10
children 6e7f60f6f9d4
line wrap: on
line diff
--- a/libass/ass_drawing.c	Sat Sep 10 09:37:52 2011 +0000
+++ b/libass/ass_drawing.c	Sun Sep 11 10:33:13 2011 +0000
@@ -118,9 +118,10 @@
     // Close the last contour
     drawing_close_shape(drawing);
 
-    ass_msg(drawing->library, MSGL_V,
-            "Parsed drawing with %d points and %d contours", ol->n_points,
-            ol->n_contours);
+    if (drawing->library)
+        ass_msg(drawing->library, MSGL_V,
+                "Parsed drawing with %d points and %d contours", ol->n_points,
+                ol->n_contours);
 
     if (raw_mode)
         return;
@@ -367,7 +368,8 @@
     drawing->fontconfig_priv = fontconfig_priv;
     drawing->font = font;
     drawing->ftlibrary = lib;
-    drawing->library = font ? font->library : NULL;
+    if (font)
+        drawing->library = font->library;
 
     drawing->scale_x = 1.;
     drawing->scale_y = 1.;