# HG changeset patch # User reimar # Date 1344277562 0 # Node ID a8859956ed3c872c0b571a4eb4d11505679f4794 # Parent c77eb6f184a21b1dd0ebca2eba5dc595c36730f9 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 diff -r c77eb6f184a2 -r a8859956ed3c libmpcodecs/vf_expand.c --- a/libmpcodecs/vf_expand.c Mon Aug 06 15:39:04 2012 +0000 +++ b/libmpcodecs/vf_expand.c Mon Aug 06 18:26:02 2012 +0000 @@ -336,10 +336,6 @@ 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 @@ 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; }