diff options
| author | Martin Storsjö <martin@martin.st> | 2012-08-31 12:52:18 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-04 23:13:38 +0300 |
| commit | d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 (patch) | |
| tree | 1ae54e270c0533eb8fd62bb8d3ebde4e9b737c34 /libavutil/opt.c | |
| parent | 124134e42455763b28cc346fed1d07017a76e84e (diff) | |
| download | ffmpeg-d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078.tar.gz | |
avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavutil/opt.c')
| -rw-r--r-- | libavutil/opt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 822e72b17a..5deb5c59d6 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -161,7 +161,8 @@ static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **d } #define DEFAULT_NUMVAL(opt) ((opt->type == AV_OPT_TYPE_INT64 || \ - opt->type == AV_OPT_TYPE_CONST) ? \ + opt->type == AV_OPT_TYPE_CONST || \ + opt->type == AV_OPT_TYPE_FLAGS) ? \ opt->default_val.i64 : opt->default_val.dbl) static int set_string_number(void *obj, const AVOption *o, const char *val, void *dst) @@ -648,13 +649,13 @@ void av_opt_set_defaults2(void *s, int mask, int flags) case AV_OPT_TYPE_CONST: /* Nothing to be done here */ break; - case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT: { int val; val = opt->default_val.dbl; av_opt_set_int(s, opt->name, val, 0); } break; + case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT64: av_opt_set_int(s, opt->name, opt->default_val.i64, 0); break; @@ -858,7 +859,7 @@ static const AVOption test_options[]= { {"toggle", "set toggle", OFFSET(toggle), AV_OPT_TYPE_INT, {0}, 0, 1 }, {"rational", "set rational", OFFSET(rational), AV_OPT_TYPE_RATIONAL, {0}, 0, 10 }, {"string", "set string", OFFSET(string), AV_OPT_TYPE_STRING, {0}, CHAR_MIN, CHAR_MAX }, -{"flags", "set flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {0}, 0, INT_MAX, 0, "flags" }, +{"flags", "set flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, INT_MAX, 0, "flags" }, {"cool", "set cool flag ", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_COOL}, INT_MIN, INT_MAX, 0, "flags" }, {"lame", "set lame flag ", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_LAME}, INT_MIN, INT_MAX, 0, "flags" }, {"mu", "set mu flag ", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_MU}, INT_MIN, INT_MAX, 0, "flags" }, |