Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv24437 Modified Files: codec-cfg.h codec-cfg.c Log Message: added informat support (for encoding) Index: codec-cfg.h =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- codec-cfg.h 11 Feb 2002 09:15:30 -0000 1.41 +++ codec-cfg.h 12 Feb 2002 17:33:27 -0000 1.42 @@ -2,7 +2,8 @@ #define __CODEC_CFG_H #define CODECS_MAX_FOURCC 32 -#define CODECS_MAX_OUTFMT 32 +#define CODECS_MAX_OUTFMT 16 +#define CODECS_MAX_INFMT 16 // Global flags: #define CODECS_FLAG_SEEKABLE (1<<0) @@ -76,6 +77,8 @@ unsigned int fourccmap[CODECS_MAX_FOURCC]; unsigned int outfmt[CODECS_MAX_OUTFMT]; unsigned char outflags[CODECS_MAX_OUTFMT]; + unsigned int infmt[CODECS_MAX_INFMT]; + unsigned char inflags[CODECS_MAX_INFMT]; char *name; char *info; char *comment; Index: codec-cfg.c =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- codec-cfg.c 11 Feb 2002 09:15:30 -0000 1.67 +++ codec-cfg.c 12 Feb 2002 17:33:27 -0000 1.68 @@ -135,7 +135,7 @@ }; -static int add_to_out(char *sfmt, char *sflags, unsigned int *outfmt, +static int add_to_inout(char *sfmt, char *sflags, unsigned int *outfmt, unsigned char *outflags) { @@ -500,6 +500,7 @@ memset(codec,0,sizeof(codecs_t)); memset(codec->fourcc, 0xff, sizeof(codec->fourcc)); memset(codec->outfmt, 0xff, sizeof(codec->outfmt)); + memset(codec->infmt, 0xff, sizeof(codec->infmt)); if (get_token(1, 1) < 0) goto err_out_parse_error; @@ -573,8 +574,14 @@ } else if (!strcmp(token[0], "out")) { if (get_token(1, 2) < 0) goto err_out_parse_error; - if (!add_to_out(token[0], token[1], codec->outfmt, + if (!add_to_inout(token[0], token[1], codec->outfmt, codec->outflags)) + goto err_out_print_linenum; + } else if (!strcmp(token[0], "in")) { + if (get_token(1, 2) < 0) + goto err_out_parse_error; + if (!add_to_inout(token[0], token[1], codec->infmt, + codec->inflags)) goto err_out_print_linenum; } else if (!strcmp(token[0], "flags")) { if (get_token(1, 1) < 0)