[MPlayer-cvslog] r23502 - trunk/libmpdemux/demux_mkv.c

[eugeni]

Author: eugeni
Date: Fri Jun  8 00:45:41 2007
New Revision: 23502

Log:
Fix segfault when encoding from an mkv file with embedded fonts.
Patch by Dominique Dumont (domi dumont at free fr).


Modified:
   trunk/libmpdemux/demux_mkv.c

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	(original)
+++ trunk/libmpdemux/demux_mkv.c	Fri Jun  8 00:45:41 2007
@@ -1533,7 +1533,8 @@ demux_mkv_read_attachments (demuxer_t *d
                      "[mkv] Attachment: %s, %s, %u bytes\n",
                      name, mime, data_size);
 #ifdef USE_ASS
-              if (extract_embedded_fonts && name && data && data_size &&
+              if (ass_library &&
+                  extract_embedded_fonts && name && data && data_size &&
                   mime && (strcmp(mime, "application/x-truetype-font") == 0 ||
                   strcmp(mime, "application/x-font") == 0))
                 ass_add_font(ass_library, name, data, data_size);