summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-29 21:57:05 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-29 21:57:05 +0000
commita69f29069bc5eb26dd4e5479c4d93c7c216789db (patch)
tree656e729185144ca3e783f184946ed71495f6719f /libmpdemux
parentf920ca0b819f8a1d45a1ed80c91e86bbf44c136c (diff)
downloadmpv-a69f29069bc5eb26dd4e5479c4d93c7c216789db.tar.bz2
mpv-a69f29069bc5eb26dd4e5479c4d93c7c216789db.tar.xz
revert one line of version 1.182 patch (caused use of already-freed
memory and multiple double-free errors). i am fairly confident that all the relevant memory is now freed once and exactly once, but it's better than corrupting the heap in any case. 100l to reimar :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15298 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demuxer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 3c675c6bef..268e8f1f4d 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -224,7 +224,7 @@ void free_demuxer(demuxer_t *demuxer){
case DEMUXER_TYPE_SMJPEG:
demux_close_smjpeg(demuxer); break;
case DEMUXER_TYPE_DEMUXERS:
- demux_close_demuxers(demuxer); break;
+ demux_close_demuxers(demuxer); return;
case DEMUXER_TYPE_AVI:
case DEMUXER_TYPE_AVI_NI:
case DEMUXER_TYPE_AVI_NINI: