diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-14 16:15:21 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-14 16:15:21 +0000 |
| commit | 7cf0b7af8ffc61acb8cee630c5045c63681b3063 (patch) | |
| tree | 8c715115a7875fcbd70c9f297c20e832f9a8542c /mencoder.c | |
| parent | 02f8775055e381fe082b31bd55d249d4748cd6dd (diff) | |
| download | mpv-7cf0b7af8ffc61acb8cee630c5045c63681b3063.tar.bz2 mpv-7cf0b7af8ffc61acb8cee630c5045c63681b3063.tar.xz | |
10l in last commit, move configured-check inside sh_video and sh_video->vfilter check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19395 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mencoder.c b/mencoder.c index 7f3657d987..90ca998e13 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1543,11 +1543,11 @@ if (!interrupted && filelist[++curfile].name != 0) { /* 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); } |