[Mplayer-cvslog] CVS: main/libmpcodecs vf_expand.c,1.13,1.14

[Arpi of Ize]

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

Modified Files:
	vf_expand.c 
Log Message:
DR1+IPB support (works only with ffmpeg12, as libmpeg2 doesn't accept stride)


Index: vf_expand.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_expand.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vf_expand.c	23 Jun 2002 21:08:31 -0000	1.13
+++ vf_expand.c	20 Jul 2002 16:38:31 -0000	1.14
@@ -181,7 +181,7 @@
 // codec -copy-> expand -copy-> vo (worst case)
 
 static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
-    if(mpi->type==MP_IMGTYPE_IPB) return; // not yet working
+//    if(mpi->type==MP_IMGTYPE_IPB) return; // not yet working
 #ifdef OSD_SUPPORT
     if(vf->priv->osd && (mpi->flags&MP_IMGFLAG_PRESERVE)){
 	// check if we have to render osd!
@@ -213,11 +213,13 @@
 	mpi->stride[0]=vf->priv->dmpi->stride[0];
 	mpi->width=vf->priv->dmpi->width;
 	mpi->flags|=MP_IMGFLAG_DIRECT;
+	mpi->priv=(void*)vf->priv->dmpi;
     }
 }
 
 static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
     if(mpi->flags&MP_IMGFLAG_DIRECT){
+	vf->priv->dmpi=mpi->priv;
 #ifdef OSD_SUPPORT
 	if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h);
 #endif