changeset 19389:99ab8f53de3b

10l in last commit, move configured-check inside sh_video and sh_video->vfilter check.
author reimar
date Mon, 14 Aug 2006 16:15:21 +0000
parents 6ad0d5247fee
children 795e54bb8f87
files mencoder.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Mon Aug 14 14:43:38 2006 +0000
+++ b/mencoder.c	Mon Aug 14 16:15:21 2006 +0000
@@ -1543,11 +1543,11 @@
 
 /* Emit the remaining frames in the video system */
 /*TODO emit frmaes delayed by decoder lag*/
-if (!((vf_instance_t *)sh_video->vfilter)->fmt.have_configured) {
-	mp_msg(MSGT_MENCODER, MSGL_WARN, "\nFilters have not been configured! Empty file?\n");
-} else
 if(sh_video && sh_video->vfilter){
 	mp_msg(MSGT_MENCODER, MSGL_INFO, "\nFlushing video frames\n");
+	if (!((vf_instance_t *)sh_video->vfilter)->fmt.have_configured)
+	mp_msg(MSGT_MENCODER, MSGL_WARN, "Filters have not been configured! Empty file?\n");
+	else
 	((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter,
     	                                              VFCTRL_FLUSH_FRAMES, 0);
 }