# HG changeset patch
# User arpi
# Date 1032985654 0
# Node ID 10d4eec4093812e2a1bfdc386045d3d7f2fa8dc3
# Parent  3d35a56799fcc6e5bacc51c33c0cd9cc335e845e
fixed order of uninit (codec, demuxer, stream) - found by Jindrich Makovicka
<makovick@kmlinux.fjfi.cvut.cz>

diff -r 3d35a56799fc -r 10d4eec40938 mencoder.c
--- a/mencoder.c	Tue Sep 24 11:23:23 2002 +0000
+++ b/mencoder.c	Wed Sep 25 20:27:34 2002 +0000
@@ -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;