From 124134e42455763b28cc346fed1d07017a76e84e Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 31 Aug 2012 12:45:52 +0300 Subject: avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavcodec/proresenc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libavcodec/proresenc.c') diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c index 86def00819..ac8f4cfad1 100644 --- a/libavcodec/proresenc.c +++ b/libavcodec/proresenc.c @@ -1025,13 +1025,13 @@ static const AVOption options[] = { { "profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, { PRORES_PROFILE_STANDARD }, PRORES_PROFILE_PROXY, PRORES_PROFILE_HQ, VE, "profile" }, - { "proxy", NULL, 0, AV_OPT_TYPE_CONST, { PRORES_PROFILE_PROXY }, + { "proxy", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_PROXY }, 0, 0, VE, "profile" }, - { "lt", NULL, 0, AV_OPT_TYPE_CONST, { PRORES_PROFILE_LT }, + { "lt", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_LT }, 0, 0, VE, "profile" }, - { "standard", NULL, 0, AV_OPT_TYPE_CONST, { PRORES_PROFILE_STANDARD }, + { "standard", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_STANDARD }, 0, 0, VE, "profile" }, - { "hq", NULL, 0, AV_OPT_TYPE_CONST, { PRORES_PROFILE_HQ }, + { "hq", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_HQ }, 0, 0, VE, "profile" }, { "vendor", "vendor ID", OFFSET(vendor), AV_OPT_TYPE_STRING, { .str = "Lavc" }, CHAR_MIN, CHAR_MAX, VE }, @@ -1039,17 +1039,17 @@ static const AVOption options[] = { AV_OPT_TYPE_INT, { 0 }, 0, 8192, VE }, { "quant_mat", "quantiser matrix", OFFSET(quant_sel), AV_OPT_TYPE_INT, { -1 }, -1, QUANT_MAT_DEFAULT, VE, "quant_mat" }, - { "auto", NULL, 0, AV_OPT_TYPE_CONST, { -1 }, + { "auto", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, VE, "quant_mat" }, - { "proxy", NULL, 0, AV_OPT_TYPE_CONST, { QUANT_MAT_PROXY }, + { "proxy", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = QUANT_MAT_PROXY }, 0, 0, VE, "quant_mat" }, - { "lt", NULL, 0, AV_OPT_TYPE_CONST, { QUANT_MAT_LT }, + { "lt", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = QUANT_MAT_LT }, 0, 0, VE, "quant_mat" }, - { "standard", NULL, 0, AV_OPT_TYPE_CONST, { QUANT_MAT_STANDARD }, + { "standard", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = QUANT_MAT_STANDARD }, 0, 0, VE, "quant_mat" }, - { "hq", NULL, 0, AV_OPT_TYPE_CONST, { QUANT_MAT_HQ }, + { "hq", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = QUANT_MAT_HQ }, 0, 0, VE, "quant_mat" }, - { "default", NULL, 0, AV_OPT_TYPE_CONST, { QUANT_MAT_DEFAULT }, + { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = QUANT_MAT_DEFAULT }, 0, 0, VE, "quant_mat" }, { NULL } }; -- cgit v1.2.3