diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-15 22:41:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-15 22:41:28 +0000 |
| commit | ad94b5e132172c36eb84580eec7621900643da5d (patch) | |
| tree | 37128239176f4a68c5e38c498ad10b7985ee1d2f /libmpcodecs/dec_video.c | |
| parent | 3fc73ead6667cdc96443954194f3b463ecda2a30 (diff) | |
| download | mpv-ad94b5e132172c36eb84580eec7621900643da5d.tar.bz2 mpv-ad94b5e132172c36eb84580eec7621900643da5d.tar.xz | |
OSD handled by vf control()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5644 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/dec_video.c')
| -rw-r--r-- | libmpcodecs/dec_video.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index cb6186534d..a1d57dda4e 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -194,16 +194,15 @@ else if(gCpuCaps.hasMMX){ } #endif -if(!mpi) return 0; // error / skipped frame - t2=GetTimer();t=t2-t; tt = t*0.000001f; video_time_usage+=tt; -if(drop_frame) return 0; +if(!mpi || drop_frame) return 0; // error / skipped frame //vo_draw_image(video_out,mpi); vf->put_image(vf,mpi); +vf->control(vf,VFCTRL_DRAW_OSD,NULL); t2=GetTimer()-t2; tt=t2*0.000001f; |