[MPlayer-cvslog] CVS: main mplayer.c,1.811,1.812

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv23593

Modified Files:
	mplayer.c 
Log Message:
free freetype descriptor and library and mconfig data right before exit


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -r1.811 -r1.812
--- mplayer.c	15 Nov 2004 09:09:27 -0000	1.811
+++ mplayer.c	15 Nov 2004 15:29:39 -0000	1.812
@@ -483,8 +483,18 @@
   vo_uninit();	// close the X11 connection (if any opened)
 #endif
 
+#ifdef HAVE_FREETYPE
+  current_module="uninit_font";
+  if (vo_font) free_font_desc(vo_font);
+  vo_font = NULL;
+  done_freetype();
+#endif
+
   current_module="exit_player";
 
+// free mplayer config
+  free(mconfig);
+
 #ifdef USE_EDL
   if(edl_records != NULL) free(edl_records); // free mem allocated for EDL
 #endif
@@ -4129,12 +4139,6 @@
   goto play_next_file;
 }
 
-#ifdef HAVE_FREETYPE
-current_module="uninit_font";
-if (vo_font) free_font_desc(vo_font);
-vo_font = NULL;
-done_freetype();
-#endif
 
 exit_player_with_rc(MSGTR_Exit_eof, 0);