diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-10 22:18:32 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-10 22:18:32 +0000 |
| commit | c7944423a3152cf731f8d7f18f1989d59ccfc935 (patch) | |
| tree | 1ba4d67aaa3179ed1d6346f09f12411298f0bcb1 /libmpcodecs/dec_video.c | |
| parent | 52e890ea55c5eea5daeefcea8b81a346d67e65db (diff) | |
| download | mpv-c7944423a3152cf731f8d7f18f1989d59ccfc935.tar.bz2 mpv-c7944423a3152cf731f8d7f18f1989d59ccfc935.tar.xz | |
changing return type of put_image void->int
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7369 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/dec_video.c')
| -rw-r--r-- | libmpcodecs/dec_video.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 58b353400a..ad4fce1f84 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -212,6 +212,7 @@ mp_image_t *mpi=NULL; unsigned int t=GetTimer(); unsigned int t2; double tt; +int ret; //if(!(sh_video->ds->flags&1) || sh_video->ds->pack_no<5) mpi=mpvdec->decode(sh_video, start, in_size, drop_frame); @@ -237,12 +238,12 @@ if(!mpi || drop_frame) return 0; // error / skipped frame //vo_draw_image(video_out,mpi); vf=sh_video->vfilter; -vf->put_image(vf,mpi); -vf->control(vf,VFCTRL_DRAW_OSD,NULL); +ret = vf->put_image(vf,mpi); // apply video filters and call the leaf vo/ve +if(ret>0) vf->control(vf,VFCTRL_DRAW_OSD,NULL); t2=GetTimer()-t2; tt=t2*0.000001f; vout_time_usage+=tt; - return 1; +return ret; } |