diff options
| author | Martin Storsjö <martin@martin.st> | 2012-08-31 13:22:31 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-04 23:13:44 +0300 |
| commit | e6153f173a49e5bfa70b0c04d2f82930533597b9 (patch) | |
| tree | 7eac138db7402d4c6692433af9efdc8a30d4a486 /libavutil/opt.c | |
| parent | d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 (diff) | |
avopt: Store defaults for AV_OPT_TYPE_INT 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 | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 5deb5c59d6..b75eb94e78 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -162,7 +162,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_FLAGS) ? \ + opt->type == AV_OPT_TYPE_FLAGS || \ + opt->type == AV_OPT_TYPE_INT) ? \ opt->default_val.i64 : opt->default_val.dbl) static int set_string_number(void *obj, const AVOption *o, const char *val, void *dst) @@ -649,13 +650,8 @@ 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_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_INT: case AV_OPT_TYPE_INT64: av_opt_set_int(s, opt->name, opt->default_val.i64, 0); break; @@ -855,8 +851,8 @@ typedef struct TestContext #define TEST_FLAG_MU 04 static const AVOption test_options[]= { -{"num", "set num", OFFSET(num), AV_OPT_TYPE_INT, {0}, 0, 100 }, -{"toggle", "set toggle", OFFSET(toggle), AV_OPT_TYPE_INT, {0}, 0, 1 }, +{"num", "set num", OFFSET(num), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 100 }, +{"toggle", "set toggle", OFFSET(toggle), AV_OPT_TYPE_INT, {.i64 = 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, {.i64 = 0}, 0, INT_MAX, 0, "flags" }, |