summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-24 15:43:20 +0000
committerods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-24 15:43:20 +0000
commit6133e7cf8703eb7cbb587be158a715079bcbbf06 (patch)
treec70fe8d868cfd78fcd9f6eb72787436c96b15afd /mencoder.c
parent593dda77e9cc6b7033f7e709a2f6e937066f4b21 (diff)
downloadmpv-6133e7cf8703eb7cbb587be158a715079bcbbf06.tar.bz2
mpv-6133e7cf8703eb7cbb587be158a715079bcbbf06.tar.xz
Add uninit for audio before switching to next file and completing encode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17676 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c
index 589c0422de..cd76cb901f 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -1524,6 +1524,7 @@ if (!interrupted && filelist[++curfile].name != 0) {
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 @@ if(sh_audio)
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