[MPlayer-cvslog] CVS: main mencoder.c,1.272,1.273

[Richard Felker CVS]

CVS change done by Richard Felker CVS

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

Modified Files:
	mencoder.c 
Log Message:
patch by ods15:
"10000l to me, I forgot that 'vfilter' could be NULL in case of framecopy, so
this code always segfaulted when merging files using -ovc copy..."



Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- mencoder.c	7 Mar 2005 22:00:29 -0000	1.272
+++ mencoder.c	13 Mar 2005 21:38:20 -0000	1.273
@@ -1723,6 +1723,7 @@
 } // 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);
@@ -1730,6 +1731,7 @@
 		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){ uninit_video(sh_video);sh_video=NULL; }
 	if(demuxer) free_demuxer(demuxer);