[MPlayer-cvslog] r35202 - trunk/libmpcodecs/vf_delogo.c

[reimar]

Author: reimar
Date: Mon Sep 17 21:50:29 2012
New Revision: 35202

Log:
Fix delogo filter with numbered mpi.

Should fix bug #2087.

Modified:
   trunk/libmpcodecs/vf_delogo.c

Modified: trunk/libmpcodecs/vf_delogo.c
==============================================================================
--- trunk/libmpcodecs/vf_delogo.c	Mon Sep 17 21:35:25 2012	(r35201)
+++ trunk/libmpcodecs/vf_delogo.c	Mon Sep 17 21:50:29 2012	(r35202)
@@ -180,6 +180,7 @@ static void get_image(struct vf_instance
     if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change
     if(mpi->imgfmt!=vf->priv->outfmt) return; // colorspace differ
     // ok, we can do pp in-place (or pp disabled):
+    mpi->priv =
     vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
                           mpi->type, mpi->flags, mpi->w, mpi->h);
     mpi->planes[0]=vf->dmpi->planes[0];
@@ -197,7 +198,9 @@ static void get_image(struct vf_instance
 static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
 
-    if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
+    if(mpi->flags&MP_IMGFLAG_DIRECT) {
+        vf->dmpi = mpi->priv;
+    } else {
         // no DR, so get a new image! hope we'll get DR buffer:
         vf->dmpi=vf_get_image(vf->next,vf->priv->outfmt,
                               MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,