mirror of
https://github.com/mpv-player/mpv
synced 2025-01-31 12:11:52 +00:00
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
This commit is contained in:
parent
afb96a8875
commit
b7765049ae
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user