Mercurial > mplayer.hg
changeset 34967:a8859956ed3c
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
| author | reimar |
|---|---|
| date | Mon, 06 Aug 2012 18:26:02 +0000 |
| parents | c77eb6f184a2 |
| children | 0807ab90536c |
| files | libmpcodecs/vf_expand.c |
| diffstat | 1 files changed, 0 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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; }