Mercurial > mplayer.hg
changeset 31406:0fd1b3f1fe69
Auto-update CODEC_CFG_MIN value to release value in etc/codecs.conf.
Allowing them to differ causes more issues than it is worth.
| author | reimar |
|---|---|
| date | Sat, 19 Jun 2010 18:31:35 +0000 |
| parents | 44863071e668 |
| children | 4a2394931e6e |
| files | codec-cfg.c codec-cfg.h |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/codec-cfg.c Fri Jun 18 17:28:17 2010 +0000 +++ b/codec-cfg.c Sat Jun 19 18:31:35 2010 +0000 @@ -59,7 +59,9 @@ #include "libmpcodecs/img_format.h" #include "codec-cfg.h" -#ifndef CODECS2HTML +#ifdef CODECS2HTML +#define CODEC_CFG_MIN 20100000 +#else #include "codecs.conf.h" #endif @@ -75,6 +77,7 @@ #define TYPE_VIDEO 0 #define TYPE_AUDIO 1 +static int codecs_conf_release; char * codecs_file = NULL; static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc, @@ -578,6 +581,7 @@ tmp = atoi(token[0]); if (tmp < CODEC_CFG_MIN) goto err_out_release_num; + codecs_conf_release = tmp; while ((tmp = get_token(1, 1)) == RET_EOL) /* NOTHING */; if (tmp == RET_EOF) @@ -1033,6 +1037,8 @@ */ if (!(nr_codecs = parse_codec_cfg((argc>1)?argv[1]:"etc/codecs.conf"))) exit(1); + if (codecs_conf_release < CODEC_CFG_MIN) + exit(1); if (argc > 1) { int i, j; @@ -1051,6 +1057,7 @@ printf("/* GENERATED FROM %s, DO NOT EDIT! */\n\n",argv[1]); printf("#include <stddef.h>\n",argv[1]); printf("#include \"codec-cfg.h\"\n\n",argv[1]); + printf("#define CODEC_CFG_MIN %i\n\n", codecs_conf_release); for (i=0; i<2; i++) { printf("const codecs_t %s[] = {\n", nm[i]);