diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-23 01:56:21 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-23 01:56:21 +0200 |
| commit | 5995bc175aea0417ce7ff7285c1c8fc84ebb5704 (patch) | |
| tree | 7fa0b90e03fc5b3a6447b79754b654bc279f5237 /libmpcodecs/vf_scale.c | |
| parent | 4c552b2e420ba4cb6d888b12360c7bf63e7cd03a (diff) | |
| parent | af2988cbcef1b057772d44b9f9752be3f15960b0 (diff) | |
| download | mpv-5995bc175aea0417ce7ff7285c1c8fc84ebb5704.tar.bz2 mpv-5995bc175aea0417ce7ff7285c1c8fc84ebb5704.tar.xz | |
Merge svn changes up to r29962
Diffstat (limited to 'libmpcodecs/vf_scale.c')
| -rw-r--r-- | libmpcodecs/vf_scale.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index ab931c8080..3a1bae77c8 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -65,6 +65,8 @@ static const unsigned int outfmt_list[]={ IMGFMT_RGB32, IMGFMT_BGR24, IMGFMT_RGB24, + IMGFMT_RGB48LE, + IMGFMT_RGB48BE, IMGFMT_BGR16, IMGFMT_RGB16, IMGFMT_BGR15, @@ -505,25 +507,6 @@ static int open(vf_instance_t *vf, char* args){ vf->query_format=query_format; vf->control= control; vf->uninit=uninit; - if(!vf->priv) { - vf->priv=malloc(sizeof(struct vf_priv_s)); - // TODO: parse args -> - vf->priv->ctx=NULL; - vf->priv->ctx2=NULL; - vf->priv->w= - vf->priv->h=-1; - vf->priv->v_chr_drop=0; - vf->priv->accurate_rnd=0; - vf->priv->param[0]= - vf->priv->param[1]=SWS_PARAM_DEFAULT; - vf->priv->palette=NULL; - } // if(!vf->priv) - if(args) sscanf(args, "%d:%d:%d:%lf:%lf", - &vf->priv->w, - &vf->priv->h, - &vf->priv->v_chr_drop, - &vf->priv->param[0], - &vf->priv->param[1]); mp_msg(MSGT_VFILTER,MSGL_V,"SwScale params: %d x %d (-1=no scaling)\n", vf->priv->w, vf->priv->h); |