diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:53:08 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:56:10 +0200 |
| commit | d46b86bc7c39082b26ec71aa16431f3275d836ff (patch) | |
| tree | 035da87ed658f7d75c0eba5a5d4de5462a4c8ddd /mplayer.c | |
| parent | a06b32b64e91082c11f747e2910f10a4afd3dfa9 (diff) | |
| parent | 3e8f2815c19703f5cb6f75db2910234d499d9676 (diff) | |
| download | mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.bz2 mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.xz | |
Merge svn changes up to r30136
Ignore another broken correct-pts change in 30134.
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -699,6 +699,7 @@ void exit_player_with_rc(struct MPContext *mpctx, exit_reason_t how, int rc) #ifdef CONFIG_ASS ass_library_done(ass_library); + ass_library = NULL; #endif current_module="exit_player"; @@ -706,13 +707,19 @@ void exit_player_with_rc(struct MPContext *mpctx, exit_reason_t how, int rc) // free mplayer config if(mpctx->mconfig) m_config_free(mpctx->mconfig); + mpctx->mconfig = NULL; + if(mpctx->playtree_iter) + play_tree_iter_free(mpctx->playtree_iter); + mpctx->playtree_iter = NULL; if(mpctx->playtree) play_tree_free(mpctx->playtree, 1); + mpctx->playtree = NULL; talloc_free(mpctx->key_fifo); if(edl_records != NULL) free(edl_records); // free mem allocated for EDL + edl_records = NULL; switch(how) { case EXIT_QUIT: mp_tmsg(MSGT_CPLAYER,MSGL_INFO,"\nExiting... (%s)\n","Quit"); |