[MPlayer-cvslog] r35208 - trunk/libmpcodecs/vf_screenshot.c

[reimar]

Author: reimar
Date: Fri Sep 21 22:20:11 2012
New Revision: 35208

Log:
Fix handling of out-of-order slice rendered frames.

Modified:
   trunk/libmpcodecs/vf_screenshot.c

Modified: trunk/libmpcodecs/vf_screenshot.c
==============================================================================
--- trunk/libmpcodecs/vf_screenshot.c	Fri Sep 21 20:57:00 2012	(r35207)
+++ trunk/libmpcodecs/vf_screenshot.c	Fri Sep 21 22:20:11 2012	(r35208)
@@ -138,6 +138,7 @@ static void scale_image(struct vf_priv_s
 
 static void start_slice(struct vf_instance *vf, mp_image_t *mpi)
 {
+    mpi->priv=
     vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
         mpi->type, mpi->flags, mpi->width, mpi->height);
     if (vf->priv->shot) {
@@ -188,10 +189,7 @@ static int put_image(struct vf_instance 
 {
     mp_image_t *dmpi = (mp_image_t *)mpi->priv;
 
-    if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
-      dmpi = vf->dmpi;
-    else
-    if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
+    if(!(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK))){
         dmpi=vf_get_image(vf->next,mpi->imgfmt,
                                     MP_IMGTYPE_EXPORT, 0,
                                     mpi->width, mpi->height);