[MPlayer-cvslog] r34903 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Tue May 15 22:56:53 2012
New Revision: 34903

Log:
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.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Tue May 15 20:27:56 2012	(r34902)
+++ trunk/mplayer.c	Tue May 15 22:56:53 2012	(r34903)
@@ -586,10 +586,8 @@ void uninit_player(unsigned int mask)
     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;
     }