summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-15 15:29:39 +0000
committeriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-15 15:29:39 +0000
commit1f6fb814b2db702eedf69610e431f7b3eed28b11 (patch)
tree2a5b9b654c2e95a4a46450d93f45e86ca857d36c /mplayer.c
parenta7fc263cd0b46463ca46a7aa762a82ccadd8fa84 (diff)
downloadmpv-1f6fb814b2db702eedf69610e431f7b3eed28b11.tar.bz2
mpv-1f6fb814b2db702eedf69610e431f7b3eed28b11.tar.xz
free freetype descriptor and library and mconfig data right before exit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13957 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/mplayer.c b/mplayer.c
index 2d947f56b6..872e0f05d2 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -483,8 +483,18 @@ static void exit_player_with_rc(char* how, int rc){
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 @@ if(use_gui || playtree_iter != NULL){
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);