[MPlayer-cvslog] r35061 - trunk/libmpcodecs/vf_expand.c

[reimar]

Author: reimar
Date: Mon Aug  6 20:26:02 2012
New Revision: 35061

Log:
Remove outdated code that instead of preventing now causes crashes.

The problem it was trying to catch (next filter not supporting slices)
was fixed already in r10141 (by implementing a fallback version
of vf_next_draw_slice).
This should fix Debian Bug#683907.
Example command-line:
mencoder big_buck_bunny_480p_stereo.avi -o a.mpg -vf crop=346:240:2:24 -oac copy -ovc lavc

Modified:
   trunk/libmpcodecs/vf_expand.c

Modified: trunk/libmpcodecs/vf_expand.c
==============================================================================
--- trunk/libmpcodecs/vf_expand.c	Mon Aug  6 17:39:04 2012	(r35060)
+++ trunk/libmpcodecs/vf_expand.c	Mon Aug  6 20:26:02 2012	(r35061)
@@ -336,10 +336,6 @@ static void get_image(struct vf_instance
 
 static void start_slice(struct vf_instance *vf, mp_image_t *mpi){
 //    printf("start_slice called! flag=%d\n",mpi->flags&MP_IMGFLAG_DRAW_CALLBACK);
-    if(!vf->next->draw_slice){
-	mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;
-	return;
-    }
     // they want slices!!! allocate the buffer.
     if(!mpi->priv)
 	mpi->priv=vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
@@ -347,8 +343,6 @@ static void start_slice(struct vf_instan
 	    MP_IMGTYPE_TEMP, mpi->flags,
             FFMAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
             FFMAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
-    if(!(vf->dmpi->flags&MP_IMGFLAG_DRAW_CALLBACK))
-	mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices); // shouldn't happen.
     vf->priv->first_slice = 1;
 }