aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-05 14:52:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-05 14:52:52 +0200
commit8510150f48ef3a2008f97af6c4618f150a60edd7 (patch)
tree8767933672698895900a32e6e517ab3752445186 /libavutil
parent98840ee0174b227543f2c85f3df09e97ad4f2577 (diff)
parent21bc44038491e525335ad763883b0288402ff6a0 (diff)
downloadffmpeg-8510150f48ef3a2008f97af6c4618f150a60edd7.tar.gz
Merge commit '21bc44038491e525335ad763883b0288402ff6a0'
* commit '21bc44038491e525335ad763883b0288402ff6a0': avopt: Explicitly store rational option defaults in .dbl Conflicts: libavfilter/buffersrc.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/opt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 18af0edec3..960170b86f 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -906,7 +906,7 @@ typedef struct TestContext
static const AVOption test_options[]= {
{"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 },
+{"rational", "set rational", OFFSET(rational), AV_OPT_TYPE_RATIONAL, {.dbl = 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" },
{"cool", "set cool flag ", 0, AV_OPT_TYPE_CONST, {.i64 = TEST_FLAG_COOL}, INT_MIN, INT_MAX, 0, "flags" },