From 1d1df8952bf71dee97b2ef8ae5ca3e5d333cd75d Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Thu, 16 Aug 2007 14:14:31 -0600 Subject: [PATCH] Fix merge conflict. Double free. --- src/matroska.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/matroska.c b/src/matroska.c index d3643f7..f8f268d 100644 --- a/src/matroska.c +++ b/src/matroska.c @@ -431,12 +431,6 @@ int mk_close(mk_Writer *w) { ret = -1; } - w->seek_data.cues = w->f_pos - w->segment_ptr; - if (mk_closeContext(w->cues, 0) < 0) - ret = -1; - if (mk_flushContextData(w->root) < 0) - ret = -1; - if (w->wrote_header) { if (w->vlc_compat) { if (mk_seekFile(w, w->segment_ptr) < 0) -- 2.11.4.GIT