From 4198e9d45b98c7657cbddfdb74f5647e0e6c21de Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 21 Nov 2009 19:50:33 +0000 Subject: 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 --- libmpcodecs/vf_noformat.c | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'libmpcodecs/vf_noformat.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; } -- cgit v1.2.3