# HG changeset patch # User alex # Date 1013535207 0 # Node ID d8a577a524377a1645a2b7af3bce43af3ea73a32 # Parent 5a7eb882bb192148171c38ddeed25a5155fafbff added informat support (for encoding) diff -r 5a7eb882bb19 -r d8a577a52437 codec-cfg.c --- a/codec-cfg.c Tue Feb 12 17:10:21 2002 +0000 +++ b/codec-cfg.c Tue Feb 12 17:33:27 2002 +0000 @@ -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,9 +574,15 @@ } 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) goto err_out_parse_error; diff -r 5a7eb882bb19 -r d8a577a52437 codec-cfg.h --- a/codec-cfg.h Tue Feb 12 17:10:21 2002 +0000 +++ b/codec-cfg.h Tue Feb 12 17:33:27 2002 +0000 @@ -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;