summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-23 21:21:54 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-23 21:21:54 +0000
commit9ec7ec747576798871cd325c192cfed9aa2b5e1a (patch)
tree626b66a88aeee0a5d75525a75b00872869b183be
parent7c1c404505bbea0566d1c18aa7f930030699915b (diff)
downloadmpv-9ec7ec747576798871cd325c192cfed9aa2b5e1a.tar.bz2
mpv-9ec7ec747576798871cd325c192cfed9aa2b5e1a.tar.xz
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) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14023 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpcodecs/vf_spp.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c
index 05ab104b58..4a19153479 100644
--- a/libmpcodecs/vf_spp.c
+++ b/libmpcodecs/vf_spp.c
@@ -97,7 +97,6 @@ struct vf_priv_s {
int qp;
int mode;
int mpeg2;
- unsigned int outfmt;
int temp_stride;
uint8_t *src;
int16_t *temp;
@@ -452,7 +451,6 @@ static int config(struct vf_instance_s* vf,
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 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
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 control(struct vf_instance_s* vf, int request, void* data){
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 @@ static int open(vf_instance_t *vf, char* args){
}
#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;
}