diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-21 19:50:33 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-21 19:50:33 +0000 |
commit | 4198e9d45b98c7657cbddfdb74f5647e0e6c21de (patch) | |
tree | 6b70721d25ac903e415a30c972d7b9699b7160d5 /libmpcodecs | |
parent | 597c92ff7fc51392562b4985a145b2682b5758c7 (diff) | |
download | mpv-4198e9d45b98c7657cbddfdb74f5647e0e6c21de.tar.bz2 mpv-4198e9d45b98c7657cbddfdb74f5647e0e6c21de.tar.xz |
Remove unreachable parsing code: for filters that use the option parser,
the args argument to open will always be NULL and vf->priv will always be
!= NULL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29945 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_crop.c | 13 | ||||
-rw-r--r-- | libmpcodecs/vf_delogo.c | 14 | ||||
-rw-r--r-- | libmpcodecs/vf_eq.c | 6 | ||||
-rw-r--r-- | libmpcodecs/vf_format.c | 39 | ||||
-rw-r--r-- | libmpcodecs/vf_hue.c | 5 | ||||
-rw-r--r-- | libmpcodecs/vf_noformat.c | 39 | ||||
-rw-r--r-- | libmpcodecs/vf_scale.c | 19 |
7 files changed, 0 insertions, 135 deletions
diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c index 5916f611e0..0fc1ac3c28 100644 --- a/libmpcodecs/vf_crop.c +++ b/libmpcodecs/vf_crop.c @@ -144,19 +144,6 @@ static int open(vf_instance_t *vf, char* args){ vf->start_slice=start_slice; vf->draw_slice=draw_slice; vf->default_reqs=VFCAP_ACCEPT_STRIDE; - if(!vf->priv) { - vf->priv=malloc(sizeof(struct vf_priv_s)); - // TODO: parse args -> - vf->priv->crop_x= - vf->priv->crop_y= - vf->priv->crop_w= - vf->priv->crop_h=-1; - } //if(!vf->priv) - if(args) sscanf(args, "%d:%d:%d:%d", - &vf->priv->crop_w, - &vf->priv->crop_h, - &vf->priv->crop_x, - &vf->priv->crop_y); mp_msg(MSGT_VFILTER, MSGL_INFO, "Crop: %d x %d, %d ; %d\n", vf->priv->crop_w, vf->priv->crop_h, diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c index 7654b627de..c7252d2a26 100644 --- a/libmpcodecs/vf_delogo.c +++ b/libmpcodecs/vf_delogo.c @@ -204,20 +204,6 @@ static int open(vf_instance_t *vf, char* args){ 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, diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c index e85deeacff..5e8c3b0e83 100644 --- a/libmpcodecs/vf_eq.c +++ b/libmpcodecs/vf_eq.c @@ -208,12 +208,6 @@ static int open(vf_instance_t *vf, char* args) vf->put_image=put_image; 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) sscanf(args, "%d:%d", &vf->priv->brightness, &vf->priv->contrast); - process = process_C; #if HAVE_MMX if(gCpuCaps.hasMMX) process = process_MMX; diff --git a/libmpcodecs/vf_format.c b/libmpcodecs/vf_format.c index d97db98a9b..52f66a6c3a 100644 --- a/libmpcodecs/vf_format.c +++ b/libmpcodecs/vf_format.c @@ -31,45 +31,6 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ static int open(vf_instance_t *vf, char* args){ vf->query_format=query_format; vf->default_caps=0; - if(!vf->priv) { - vf->priv=malloc(sizeof(struct vf_priv_s)); - vf->priv->fmt=IMGFMT_YUY2; - } - if(args){ - if(!strcasecmp(args,"444p")) vf->priv->fmt=IMGFMT_444P; else - if(!strcasecmp(args,"422p")) vf->priv->fmt=IMGFMT_422P; else - if(!strcasecmp(args,"411p")) vf->priv->fmt=IMGFMT_411P; else - if(!strcasecmp(args,"yuy2")) vf->priv->fmt=IMGFMT_YUY2; else - if(!strcasecmp(args,"yv12")) vf->priv->fmt=IMGFMT_YV12; else - if(!strcasecmp(args,"i420")) vf->priv->fmt=IMGFMT_I420; else - if(!strcasecmp(args,"yvu9")) vf->priv->fmt=IMGFMT_YVU9; else - if(!strcasecmp(args,"if09")) vf->priv->fmt=IMGFMT_IF09; else - if(!strcasecmp(args,"iyuv")) vf->priv->fmt=IMGFMT_IYUV; else - if(!strcasecmp(args,"uyvy")) vf->priv->fmt=IMGFMT_UYVY; else - if(!strcasecmp(args,"bgr24")) vf->priv->fmt=IMGFMT_BGR24; else - if(!strcasecmp(args,"bgr32")) vf->priv->fmt=IMGFMT_BGR32; else - if(!strcasecmp(args,"bgr16")) vf->priv->fmt=IMGFMT_BGR16; else - if(!strcasecmp(args,"bgr15")) vf->priv->fmt=IMGFMT_BGR15; else - if(!strcasecmp(args,"bgr8")) vf->priv->fmt=IMGFMT_BGR8; else - if(!strcasecmp(args,"bgr4")) vf->priv->fmt=IMGFMT_BGR4; else - if(!strcasecmp(args,"bg4b")) vf->priv->fmt=IMGFMT_BG4B; else - if(!strcasecmp(args,"bgr1")) vf->priv->fmt=IMGFMT_BGR1; else - if(!strcasecmp(args,"rgb24")) vf->priv->fmt=IMGFMT_RGB24; else - if(!strcasecmp(args,"rgb32")) vf->priv->fmt=IMGFMT_RGB32; else - if(!strcasecmp(args,"rgb16")) vf->priv->fmt=IMGFMT_RGB16; else - if(!strcasecmp(args,"rgb15")) vf->priv->fmt=IMGFMT_RGB15; else - if(!strcasecmp(args,"rgb8")) vf->priv->fmt=IMGFMT_RGB8; else - if(!strcasecmp(args,"rgb4")) vf->priv->fmt=IMGFMT_RGB4; else - if(!strcasecmp(args,"rg4b")) vf->priv->fmt=IMGFMT_RG4B; else - if(!strcasecmp(args,"rgb1")) vf->priv->fmt=IMGFMT_RGB1; else - if(!strcasecmp(args,"rgba")) vf->priv->fmt=IMGFMT_RGBA; else - if(!strcasecmp(args,"argb")) vf->priv->fmt=IMGFMT_ARGB; else - if(!strcasecmp(args,"bgra")) vf->priv->fmt=IMGFMT_BGRA; else - if(!strcasecmp(args,"abgr")) vf->priv->fmt=IMGFMT_ABGR; else - { mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_UnknownFormatName, args);return 0;} - } - - return 1; } diff --git a/libmpcodecs/vf_hue.c b/libmpcodecs/vf_hue.c index 89ed3ee243..ec74c52632 100644 --- a/libmpcodecs/vf_hue.c +++ b/libmpcodecs/vf_hue.c @@ -152,11 +152,6 @@ static int open(vf_instance_t *vf, char* args) vf->put_image=put_image; 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) sscanf(args, "%f:%f", &vf->priv->hue, &vf->priv->saturation); vf->priv->hue *= M_PI / 180.0; process = process_C; diff --git a/libmpcodecs/vf_noformat.c b/libmpcodecs/vf_noformat.c index 1938da10cc..2ca91c0566 100644 --- a/libmpcodecs/vf_noformat.c +++ b/libmpcodecs/vf_noformat.c @@ -31,45 +31,6 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ static int open(vf_instance_t *vf, char* args){ vf->query_format=query_format; vf->default_caps=0; - if(!vf->priv) { - vf->priv=malloc(sizeof(struct vf_priv_s)); - vf->priv->fmt=IMGFMT_YV12; - } - if(args){ - if(!strcasecmp(args,"444p")) vf->priv->fmt=IMGFMT_444P; else - if(!strcasecmp(args,"422p")) vf->priv->fmt=IMGFMT_422P; else - if(!strcasecmp(args,"411p")) vf->priv->fmt=IMGFMT_411P; else - if(!strcasecmp(args,"yuy2")) vf->priv->fmt=IMGFMT_YUY2; else - if(!strcasecmp(args,"yv12")) vf->priv->fmt=IMGFMT_YV12; else - if(!strcasecmp(args,"i420")) vf->priv->fmt=IMGFMT_I420; else - if(!strcasecmp(args,"yvu9")) vf->priv->fmt=IMGFMT_YVU9; else - if(!strcasecmp(args,"if09")) vf->priv->fmt=IMGFMT_IF09; else - if(!strcasecmp(args,"iyuv")) vf->priv->fmt=IMGFMT_IYUV; else - if(!strcasecmp(args,"uyvy")) vf->priv->fmt=IMGFMT_UYVY; else - if(!strcasecmp(args,"bgr24")) vf->priv->fmt=IMGFMT_BGR24; else - if(!strcasecmp(args,"bgr32")) vf->priv->fmt=IMGFMT_BGR32; else - if(!strcasecmp(args,"bgr16")) vf->priv->fmt=IMGFMT_BGR16; else - if(!strcasecmp(args,"bgr15")) vf->priv->fmt=IMGFMT_BGR15; else - if(!strcasecmp(args,"bgr8")) vf->priv->fmt=IMGFMT_BGR8; else - if(!strcasecmp(args,"bgr4")) vf->priv->fmt=IMGFMT_BGR4; else - if(!strcasecmp(args,"bg4b")) vf->priv->fmt=IMGFMT_BG4B; else - if(!strcasecmp(args,"bgr1")) vf->priv->fmt=IMGFMT_BGR1; else - if(!strcasecmp(args,"rgb24")) vf->priv->fmt=IMGFMT_RGB24; else - if(!strcasecmp(args,"rgb32")) vf->priv->fmt=IMGFMT_RGB32; else - if(!strcasecmp(args,"rgb16")) vf->priv->fmt=IMGFMT_RGB16; else - if(!strcasecmp(args,"rgb15")) vf->priv->fmt=IMGFMT_RGB15; else - if(!strcasecmp(args,"rgb8")) vf->priv->fmt=IMGFMT_RGB8; else - if(!strcasecmp(args,"rgb4")) vf->priv->fmt=IMGFMT_RGB4; else - if(!strcasecmp(args,"rg4b")) vf->priv->fmt=IMGFMT_RG4B; else - if(!strcasecmp(args,"rgb1")) vf->priv->fmt=IMGFMT_RGB1; else - if(!strcasecmp(args,"rgba")) vf->priv->fmt=IMGFMT_RGBA; else - if(!strcasecmp(args,"argb")) vf->priv->fmt=IMGFMT_ARGB; else - if(!strcasecmp(args,"bgra")) vf->priv->fmt=IMGFMT_BGRA; else - if(!strcasecmp(args,"abgr")) vf->priv->fmt=IMGFMT_ABGR; else - { mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_UnknownFormatName, args);return 0;} - } - - return 1; } diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index d14b57a26a..a18b0ebe7e 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -508,25 +508,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); |