[Mplayer-cvslog] CVS: main/libmpcodecs dec_video.c,1.148,1.149

Arpi of Ize arpi at mplayerhq.hu
Sat Aug 31 23:03:19 CEST 2002


Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv3384

Modified Files:
	dec_video.c 
Log Message:
100l... sh->vcodec may be changed by mpvdec->decode()
it caused various crashes, including the mencoder+ijpg one reported by goth


Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- dec_video.c	31 Aug 2002 13:09:23 -0000	1.148
+++ dec_video.c	31 Aug 2002 21:03:03 -0000	1.149
@@ -207,7 +207,7 @@
 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 @@
 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);
 




More information about the MPlayer-cvslog mailing list