From 21bc44038491e525335ad763883b0288402ff6a0 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 31 Aug 2012 00:42:30 +0300 Subject: avopt: Explicitly store rational option defaults in .dbl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavfilter/buffersrc.c | 2 +- libavfilter/vsrc_testsrc.c | 2 +- libavutil/opt.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 62b9e99cbf..8e344cbac8 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -192,7 +192,7 @@ static av_cold int init_video(AVFilterContext *ctx, const char *args) #define OFFSET(x) offsetof(BufferSourceContext, x) #define A AV_OPT_FLAG_AUDIO_PARAM static const AVOption audio_options[] = { - { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { 0 }, 0, INT_MAX, A }, + { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, INT_MAX, A }, { "sample_rate", NULL, OFFSET(sample_rate), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, A }, { "sample_fmt", NULL, OFFSET(sample_fmt_str), AV_OPT_TYPE_STRING, .flags = A }, { "channel_layout", NULL, OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, .flags = A }, diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index ce45d64432..709a6a2e3a 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -67,7 +67,7 @@ static const AVOption testsrc_options[] = { { "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, }, { "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, }, { "duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, }, - { "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {1}, 0, INT_MAX }, + { "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl = 1}, 0, INT_MAX }, { NULL }, }; diff --git a/libavutil/opt.c b/libavutil/opt.c index b75eb94e78..b1ccf9b932 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -853,7 +853,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" }, -- cgit v1.2.3