diff options
author | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-14 17:27:15 +0000 |
---|---|---|
committer | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-14 17:27:15 +0000 |
commit | 1e7ea68b2e6d6891f758d0ed71b3ae780bd3319f (patch) | |
tree | 572a4ce0efb567be6c0ab7956a60dbcfb3198912 /mencoder.c | |
parent | 1f258a4a460e9df46ded1295f81c980a06a97c99 (diff) | |
download | mpv-1e7ea68b2e6d6891f758d0ed71b3ae780bd3319f.tar.bz2 mpv-1e7ea68b2e6d6891f758d0ed71b3ae780bd3319f.tar.xz |
Cosmetics (nothing but spaces, tabs, and a comment changed here..)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19397 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r-- | mencoder.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/mencoder.c b/mencoder.c index 3c94065dca..f0c988b6e2 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1520,23 +1520,21 @@ if(sh_audio && !demuxer2){ } // while(!at_eof) if (!interrupted && filelist[++curfile].name != 0) { - if (sh_video && sh_video->vfilter) { - // Before uniniting sh_video and the filter chain, break apart the VE. - vf_instance_t * ve; // this will be the filter right before the ve. - for (ve = sh_video->vfilter; ve->next && ve->next->next; ve = ve->next); - if (ve->next) - ve->next = NULL; // I'm telling the last filter, before the VE, there is nothing after it - else // There is no chain except the VE. - sh_video->vfilter = NULL; + if (sh_video && sh_video->vfilter) { // Before uniniting sh_video and the filter chain, break apart the VE. + vf_instance_t * ve; // this will be the filter right before the ve. + for (ve = sh_video->vfilter; ve->next && ve->next->next; ve = ve->next); + + if (ve->next) ve->next = NULL; // I'm telling the last filter, before the VE, there is nothing after it + else sh_video->vfilter = NULL; // There is no chain except the VE. } 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 - + at_eof = 0; - + m_config_pop(mconfig); goto play_next_file; } |