[Mplayer-cvslog] CVS: main mencoder.c,1.164,1.165

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv9753

Modified Files:
	mencoder.c 
Log Message:
fixed order of uninit (codec, demuxer, stream) - found by Jindrich Makovicka
<makovick at kmlinux.fjfi.cvut.cz>


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- mencoder.c	22 Sep 2002 13:37:11 -0000	1.164
+++ mencoder.c	25 Sep 2002 20:27:34 -0000	1.165
@@ -1204,8 +1204,6 @@
 
 } // while(!at_eof)
 
-if (demuxer) free_demuxer(demuxer);
-
 #ifdef HAVE_MP3LAME
 // fixup CBR mp3 audio header:
 if(sh_audio && mux_a->codec==ACODEC_VBRMP3 && !lame_param_vbr){
@@ -1249,8 +1247,8 @@
 printf(MSGTR_AudioStreamResult,
     (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (int)mux_a->size, (float)mux_a->timer);
 
-if(sh_video) uninit_video(sh_video);
-sh_video=NULL;
+if(sh_video){ uninit_video(sh_video);sh_video=NULL; }
+if(demuxer) free_demuxer(demuxer);
 if(stream) free_stream(stream); // kill cache thread
 
 return interrupted;