diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-31 21:03:03 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-31 21:03:03 +0000 |
| commit | b7765049aed438f584c61cbd56e8b913e2c6f975 (patch) | |
| tree | d61b0f3e5bb710083d3e4e04cad0bcc9f1655570 /libmpcodecs/dec_video.c | |
| parent | afb96a8875294271238db06e657d4012e8d565b2 (diff) | |
| download | mpv-b7765049aed438f584c61cbd56e8b913e2c6f975.tar.bz2 mpv-b7765049aed438f584c61cbd56e8b913e2c6f975.tar.xz | |
100l... sh->vcodec may be changed by mpvdec->decode()
it caused various crashes, including the mencoder+ijpg one reported by goth
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7211 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/dec_video.c')
| -rw-r--r-- | libmpcodecs/dec_video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index e087644dd4..58b353400a 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -207,7 +207,7 @@ int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){ extern int vo_directrendering; int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ -vf_instance_t* vf=sh_video->vfilter; +vf_instance_t* vf; mp_image_t *mpi=NULL; unsigned int t=GetTimer(); unsigned int t2; @@ -236,6 +236,7 @@ video_time_usage+=tt; 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); |