diff options
author | 2001-04-14 17:55:20 +0000 | |
---|---|---|
committer | 2001-04-14 17:55:20 +0000 | |
commit | 39a20fba347f37703f019fd1243a15a1900e609a (patch) | |
tree | 3c16182bb998c0c71aa1aea38b84b9d266878db2 /codec-cfg.c | |
parent | a8cabd5ed891a21fbca49b652f7f4766f5b9c9ef (diff) |
- applied overlay patch by Jens H
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@409 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'codec-cfg.c')
-rw-r--r-- | codec-cfg.c | 65 |
1 files changed, 31 insertions, 34 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 967c0f82cb..bd5ae21935 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -15,7 +15,7 @@ #include <assert.h> #include <string.h> -#include "libvo/video_out.h" +#include "libvo/img_format.h" #include "codec-cfg.h" #define PRINT_LINENUM printf(" at line %d\n", line_num) @@ -99,38 +99,35 @@ static int add_to_format(char *s, unsigned int *fourcc, unsigned int *fourccmap) return 1; } + static int add_to_out(char *sfmt, char *sflags, unsigned int *outfmt, unsigned char *outflags) { - static char *fmtstr[] = { - "YUY2", - "YV12", - "RGB8", - "RGB15", - "RGB16", - "RGB24", - "RGB32", - "BGR8", - "BGR15", - "BGR16", - "BGR24", - "BGR32", - NULL - }; - static unsigned int fmtnum[] = { - IMGFMT_YUY2, - IMGFMT_YV12, - IMGFMT_RGB|8, - IMGFMT_RGB|15, - IMGFMT_RGB|16, - IMGFMT_RGB|24, - IMGFMT_RGB|32, - IMGFMT_BGR|8, - IMGFMT_BGR|15, - IMGFMT_BGR|16, - IMGFMT_BGR|24, - IMGFMT_BGR|32 + static struct { + const char *name; + const unsigned int num; + } fmt_table[] = { + "YV12", IMGFMT_YV12, + "I420", IMGFMT_I420, + "IYUV", IMGFMT_IYUV, + + "YUY2", IMGFMT_YUY2, + "UYVY", IMGFMT_UYVY, + "YVYU", IMGFMT_YVYU, + + "RGB8", IMGFMT_RGB|8, + "RGB15", IMGFMT_RGB|15, + "RGB16", IMGFMT_RGB|16, + "RGB24", IMGFMT_RGB|24, + "RGB32", IMGFMT_RGB|32, + "BGR8", IMGFMT_BGR|8, + "BGR15", IMGFMT_BGR|15, + "BGR16", IMGFMT_BGR|16, + "BGR24", IMGFMT_BGR|24, + "BGR32", IMGFMT_BGR|32, + NULL, 0 }; + static char *flagstr[] = { "flip", "noflip", @@ -165,15 +162,15 @@ static int add_to_out(char *sfmt, char *sflags, unsigned int *outfmt, } do { - for (j = 0; fmtstr[j] != NULL; j++) - if (!strncmp(sfmt, fmtstr[j], strlen(fmtstr[j]))) + for (j = 0; fmt_table[j].name != NULL; j++) + if (!strncmp(sfmt, fmt_table[j].name, strlen(fmt_table[j].name))) break; - if (fmtstr[j] == NULL) + if (fmt_table[j].name == NULL) goto err_out_parse_error; - outfmt[i] = fmtnum[j]; + outfmt[i] = fmt_table[j].num; outflags[i] = flags; ++i; - sfmt+=strlen(fmtstr[j]); + sfmt+=strlen(fmt_table[j].name); } while ((*(sfmt++) == ',') && --freeslots); if (!freeslots) |