From d9db1b3b5e5f2fb46fc95209927ef222f448182a Mon Sep 17 00:00:00 2001
From: rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 13 Mar 2005 21:38:20 +0000
Subject: [PATCH] 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..."

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14942 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mencoder.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mencoder.c b/mencoder.c
index 5f47bcb4b0..3d8eaa0c3d 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -1723,6 +1723,7 @@ 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);
@@ -1730,6 +1731,7 @@ if (!interrupted && filelist[++curfile].name != 0) {
 		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);