CVS change done by Michael Niedermayer CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv20614/libmpcodecs Modified Files: vf_format.c vf_noformat.c Log Message: RGBA variants Index: vf_format.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_format.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vf_format.c 15 Mar 2003 20:51:35 -0000 1.11 +++ vf_format.c 11 Aug 2004 10:31:38 -0000 1.12 @@ -61,6 +61,10 @@ 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 { printf("Unknown format name: '%s'\n",args);return 0;} } Index: vf_noformat.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_noformat.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vf_noformat.c 6 Feb 2004 20:44:09 -0000 1.1 +++ vf_noformat.c 11 Aug 2004 10:31:38 -0000 1.2 @@ -61,6 +61,10 @@ 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 { printf("Unknown format name: '%s'\n",args);return 0;} }