[MPlayer-cvslog] r19395 - trunk/mencoder.c

[reimar]

Author: reimar
Date: Mon Aug 14 18:15:21 2006
New Revision: 19395

Modified:
   trunk/mencoder.c

Log:
10l in last commit, move configured-check inside sh_video and sh_video->vfilter check.


Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	(original)
+++ trunk/mencoder.c	Mon Aug 14 18:15:21 2006
@@ -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);
 }