[Mplayer-cvslog] CVS: 0_90/libmpcodecs vf_pp.c,1.23,1.24

Michael Niedermayer CVS michael at mplayerhq.hu
Wed Mar 5 00:05:58 CET 2003


Update of /cvsroot/mplayer/0_90/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv18998

Modified Files:
	vf_pp.c 
Log Message:
10l (pp cant convert formats) fixes segfault



Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/libmpcodecs/vf_pp.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vf_pp.c	5 Jan 2003 19:10:26 -0000	1.23
+++ vf_pp.c	4 Mar 2003 23:05:56 -0000	1.24
@@ -52,7 +52,7 @@
     if(vf->priv->context) pp_free_context(vf->priv->context);
     vf->priv->context= pp_get_context(width, height, flags);
 
-    return vf_next_config(vf,width,height,d_width,d_height,voflags,vf->priv->outfmt);
+    return vf_next_config(vf,width,height,d_width,d_height,voflags,outfmt);
 }
 
 static void uninit(struct vf_instance_s* vf){
@@ -112,7 +112,7 @@
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
     if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
 	// no DR, so get a new image! hope we'll get DR buffer:
-	vf->priv->dmpi=vf_get_image(vf->next,vf->priv->outfmt,
+	vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	    MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
 //	    MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
 //	    mpi->w,mpi->h);



More information about the MPlayer-cvslog mailing list