Mercurial > mplayer.hg

changeset 34815:049b24e18a65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not override mpctx->stream during free_demuxer. In case of e.g. the chained MPEG-PS in mov demuxer, that will end up freeing the wrong stream later on.
author reimar
date Tue, 15 May 2012 20:56:53 +0000
parents 41441963cf8a
children 0640d4451aa7
files mplayer.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Tue May 15 18:27:56 2012 +0000
+++ b/mplayer.c	Tue May 15 20:56:53 2012 +0000
@@ -586,10 +586,8 @@
     if (mask & INITIALIZED_DEMUXER) {
         initialized_flags &= ~INITIALIZED_DEMUXER;
         current_module     = "free_demuxer";
-        if (mpctx->demuxer) {
-            mpctx->stream = mpctx->demuxer->stream;
+        if (mpctx->demuxer)
             free_demuxer(mpctx->demuxer);
-        }
         mpctx->demuxer = NULL;
     }