Mercurial > mplayer.hg
diff libmpcodecs/vf_spp.c @ 14022:803be9a78854
removing strange csp matching code (was copy&pasted from vf_pp where it originated from arpi 2.5 years ago) -> fixes spp+scale+x11 crash
dont disable the filter by default (100l for iive)
author | michael |
---|---|
date | Tue, 23 Nov 2004 21:21:54 +0000 |
parents | 045dbaccaccc |
children | 1fab95e4513c |
line wrap: on
line diff
--- a/libmpcodecs/vf_spp.c Tue Nov 23 16:07:14 2004 +0000 +++ b/libmpcodecs/vf_spp.c Tue Nov 23 21:21:54 2004 +0000 @@ -97,7 +97,6 @@ int qp; int mode; int mpeg2; - unsigned int outfmt; int temp_stride; uint8_t *src; int16_t *temp; @@ -452,7 +451,6 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ 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): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, mpi->type, mpi->flags, mpi->w, mpi->h); @@ -473,7 +471,7 @@ if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: - dmpi=vf_get_image(vf->next,vf->priv->outfmt, + dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, mpi->w,mpi->h); @@ -568,7 +566,7 @@ static int open(vf_instance_t *vf, char* args){ - int log2c=0; + int log2c=-1; vf->config=config; vf->put_image=put_image; @@ -610,14 +608,6 @@ } #endif - // check csp: - vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12); - if(!vf->priv->outfmt) - { - uninit(vf); - return 0; // no csp match :( - } - return 1; }