mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
a7fc263cd0
commit
1f6fb814b2
16
mplayer.c
16
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)
|
vo_uninit(); // close the X11 connection (if any opened)
|
||||||
#endif
|
#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";
|
current_module="exit_player";
|
||||||
|
|
||||||
|
// free mplayer config
|
||||||
|
free(mconfig);
|
||||||
|
|
||||||
#ifdef USE_EDL
|
#ifdef USE_EDL
|
||||||
if(edl_records != NULL) free(edl_records); // free mem allocated for EDL
|
if(edl_records != NULL) free(edl_records); // free mem allocated for EDL
|
||||||
#endif
|
#endif
|
||||||
|
@ -4129,12 +4139,6 @@ if(use_gui || playtree_iter != NULL){
|
||||||
goto play_next_file;
|
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);
|
exit_player_with_rc(MSGTR_Exit_eof, 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue