[Mplayer-cvslog] CVS: main/libmpcodecs vf_pp.c,1.24,1.25

[Michael Niedermayer CVS]

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

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


Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vf_pp.c	14 Feb 2003 21:45:44 -0000	1.24
+++ vf_pp.c	4 Mar 2003 22:48:37 -0000	1.25
@@ -54,7 +54,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){
@@ -114,7 +114,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);