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_delogo.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_delogo.c')
| -rw-r--r-- | libmpcodecs/vf_delogo.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c index d9234b6eab..2dd971fab9 100644 --- a/libmpcodecs/vf_delogo.c +++ b/libmpcodecs/vf_delogo.c @@ -197,27 +197,11 @@ static const unsigned int fmt_list[]={ }; static int open(vf_instance_t *vf, char* args){ - int res; - vf->config=config; vf->put_image=put_image; vf->get_image=get_image; vf->query_format=query_format; vf->uninit=uninit; - if (!vf->priv) - { - vf->priv=malloc(sizeof(struct vf_priv_s)); - memset(vf->priv, 0, sizeof(struct vf_priv_s)); - } - - if (args) res = sscanf(args, "%d:%d:%d:%d:%d", - &vf->priv->xoff, &vf->priv->yoff, - &vf->priv->lw, &vf->priv->lh, - &vf->priv->band); - if (args && (res != 5)) { - uninit(vf); - return 0; // bad syntax - } mp_msg(MSGT_VFILTER, MSGL_V, "delogo: %d x %d, %d x %d, band = %d\n", vf->priv->xoff, vf->priv->yoff, |