diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-19 18:31:35 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:11:07 +0200 |
| commit | 2465ec9027bd457d10a65250bd286a1905f952ab (patch) | |
| tree | f4d476371a185e4c8e63995fd38efb030156ab98 | |
| parent | 27408d4f14f4fc99464c1db8f81288a6ecffb373 (diff) | |
| download | mpv-2465ec9027bd457d10a65250bd286a1905f952ab.tar.bz2 mpv-2465ec9027bd457d10a65250bd286a1905f952ab.tar.xz | |
codec-cfg: set CODEC_CFG_MIN to the release value in codecs.conf
Auto-update CODEC_CFG_MIN value to release value in etc/codecs.conf.
Allowing them to differ causes more issues than it is worth.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31472 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | codec-cfg.c | 9 | ||||
| -rw-r--r-- | codec-cfg.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 168529fd8c..70454b2dd4 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -57,7 +57,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 @@ -77,6 +79,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, @@ -580,6 +583,7 @@ int parse_codec_cfg(const char *cfgfile) 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) @@ -1034,6 +1038,8 @@ int main(int argc, char* argv[]) */ 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; @@ -1052,6 +1058,7 @@ int main(int argc, char* argv[]) printf("/* GENERATED FROM %s, DO NOT EDIT! */\n\n",argv[1]); printf("#include <stddef.h>\n"); printf("#include \"codec-cfg.h\"\n\n"); + 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]); diff --git a/codec-cfg.h b/codec-cfg.h index bf1fed56a8..19fd47d94c 100644 --- a/codec-cfg.h +++ b/codec-cfg.h @@ -19,8 +19,6 @@ #ifndef MPLAYER_CODEC_CFG_H #define MPLAYER_CODEC_CFG_H -#define CODEC_CFG_MIN 20070407 - #define CODECS_MAX_FOURCC 92 #define CODECS_MAX_OUTFMT 16 #define CODECS_MAX_INFMT 16 |