[MPlayer-cvslog] r36749 - trunk/gui/interface.c

[ib]

Author: ib
Date: Sun Jan 26 17:57:18 2014
New Revision: 36749

Log:
Revise non-FreeType part of mplayerLoadFont().

Use free_font_desc() instead of freeing by ourselves.

Modified:
   trunk/gui/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Jan 26 17:53:21 2014	(r36748)
+++ trunk/gui/interface.c	Sun Jan 26 17:57:18 2014	(r36749)
@@ -1087,29 +1087,7 @@ void mplayerLoadFont(void)
 
     force_load_font = 1;
 #else
-    if (vo_font) {
-        int i;
-
-        free(vo_font->name);
-        free(vo_font->fpath);
-
-        for (i = 0; i < 16; i++) {
-            if (vo_font->pic_a[i]) {
-                free(vo_font->pic_a[i]->bmp);
-                free(vo_font->pic_a[i]->pal);
-            }
-        }
-
-        for (i = 0; i < 16; i++) {
-            if (vo_font->pic_b[i]) {
-                free(vo_font->pic_b[i]->bmp);
-                free(vo_font->pic_b[i]->pal);
-            }
-        }
-
-        free(vo_font);
-        vo_font = NULL;
-    }
+    free_font_desc(vo_font);
 
     if (font_name) {
         vo_font = read_font_desc(font_name, font_factor, 0);