diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-25 20:27:34 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-25 20:27:34 +0000 |
| commit | 266037ca2bdd7ee67c10f14080ad00db29e75e02 (patch) | |
| tree | 39b2ecd2eb2500ef5101b2b42eaae18cce11f8a4 /mencoder.c | |
| parent | bcfc15f2a40b49ba56cedaa3324231221a6cd43f (diff) | |
| download | mpv-266037ca2bdd7ee67c10f14080ad00db29e75e02.tar.bz2 mpv-266037ca2bdd7ee67c10f14080ad00db29e75e02.tar.xz | |
fixed order of uninit (codec, demuxer, stream) - found by Jindrich Makovicka
<makovick@kmlinux.fjfi.cvut.cz>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7498 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c index 05aab45d28..b378accffc 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1204,8 +1204,6 @@ if(sh_audio && !demuxer2){ } // 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 @@ if(sh_audio) 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; |