Mercurial > mplayer.hg

changeset 7497:10d4eec40938

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed order of uninit (codec, demuxer, stream) - found by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
author arpi
date Wed, 25 Sep 2002 20:27:34 +0000
parents 3d35a56799fc
children 2b4190fb8218
files mencoder.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;