[MPlayer-cvslog] CVS: main mencoder.c,1.341,1.342

[Oded Shimon CVS]

CVS change done by Oded Shimon CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv16271

Modified Files:
	mencoder.c 
Log Message:
Add uninit for audio before switching to next file and completing encode


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- mencoder.c	21 Feb 2006 09:39:22 -0000	1.341
+++ mencoder.c	24 Feb 2006 15:43:20 -0000	1.342
@@ -1524,6 +1524,7 @@
 		sh_video->vfilter = NULL;
 	}
 
+	if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; }
 	if(sh_video){ uninit_video(sh_video);sh_video=NULL; }
 	if(demuxer) free_demuxer(demuxer);
 	if(stream) free_stream(stream); // kill cache thread
@@ -1572,6 +1573,7 @@
 mp_msg(MSGT_MENCODER, MSGL_INFO, 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_audio){ uninit_audio(sh_audio);sh_audio=NULL; }
 if(sh_video){ uninit_video(sh_video);sh_video=NULL; }
 if(demuxer) free_demuxer(demuxer);
 if(stream) free_stream(stream); // kill cache thread