---
libavcodec/options.c | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/libavcodec/options.c b/libavcodec/options.c
index bf27fef..5fa777f 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -244,6 +244,30 @@ static const AVOption options[]={
{"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_XVIDMMX}, 0, 0, V|E|D, "idct"},
{"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST,
{FF_IDCT_FAAN}, 0, 0, V|D|E, "idct"},
+{"coder", NULL, OFFSET(coder_type), AV_OPT_TYPE_INT, {.dbl = DEFAULT },
INT_MIN, INT_MAX, V|E, "coder"},
+{"vlc", "variable length coder / huffman coder", 0, AV_OPT_TYPE_CONST,
{FF_CODER_TYPE_VLC}, 0, 0, V|E, "coder"},
+{"ac", "arithmetic coder", 0, AV_OPT_TYPE_CONST,
{FF_CODER_TYPE_AC}, 0, 0, V|E, "coder"},
+{"raw", "raw (no encoding)", 0, AV_OPT_TYPE_CONST,
{FF_CODER_TYPE_RAW}, 0, 0, V|E, "coder"},
+{"rle", "run-length coder", 0, AV_OPT_TYPE_CONST,
{FF_CODER_TYPE_RLE}, 0, 0, V|E, "coder"},
+{"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST,
{FF_CODER_TYPE_DEFLATE}, 0, 0, V|E, "coder"},
+
+{"mbd", "macroblock decision algorithm (high quality mode)",
OFFSET(mb_decision), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E,
"mbd"},
+{"simple", "use mbcmp (default)", 0, AV_OPT_TYPE_CONST,
{FF_MB_DECISION_SIMPLE}, 0, 0, V|E, "mbd"},
+{"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST,
{FF_MB_DECISION_BITS}, 0, 0, V|E, "mbd"},
+{"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST,
{FF_MB_DECISION_RD}, 0, 0, V|E, "mbd"},
+
+{"profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, {.dbl = FF_PROFILE_UNKNOWN
}, INT_MIN, INT_MAX, V|A|E, "profile"},
+{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_UNKNOWN}, 0, 0,
V|A|E, "profile"},
+{"aac_main", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_AAC_MAIN}, 0, 0, A|E,
"profile"},
+{"aac_low", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_AAC_LOW}, 0, 0, A|E,
"profile"},
+{"aac_ssr", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_AAC_SSR}, 0, 0, A|E,
"profile"},
+{"aac_ltp", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_AAC_LTP}, 0, 0, A|E,
"profile"},
+{"dts", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_DTS}, 0, 0, A|E,
"profile"},
+{"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_DTS_ES}, 0, 0, A|E,
"profile"},
+{"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_DTS_96_24}, 0, 0, A|E,
"profile"},
+{"dts_hd_hra", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_DTS_HD_HRA}, 0, 0, A|E,
"profile"},
+{"dts_hd_ma", NULL, 0, AV_OPT_TYPE_CONST, {FF_PROFILE_DTS_HD_MA}, 0, 0, A|E,
"profile"},
+
{"extradata_size", NULL, OFFSET(extradata_size), AV_OPT_TYPE_INT, {.dbl =
DEFAULT }, INT_MIN, INT_MAX},
{"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0},
INT_MIN, INT_MAX},
{"g", "set the group of picture size", OFFSET(gop_size), AV_OPT_TYPE_INT,
{.dbl = 12 }, INT_MIN, INT_MAX, V|E},
@@ -312,19 +336,9 @@ static const AVOption options[]={
{"pbias", "inter quant bias", OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.dbl
= FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E},
{"color_table_id", NULL, OFFSET(color_table_id), AV_OPT_TYPE_INT, {.dbl =
DEFAULT }, INT_MIN, INT_MAX},
{"global_quality", NULL, OFFSET(global_quality), AV_OPT_TYPE_INT, {.dbl =
DEFAULT }, INT_MIN, INT_MAX, V|A|E},
-{"coder", NULL, OFFSET(coder_type), AV_OPT_TYPE_INT, {.dbl = DEFAULT },
INT_MIN, INT_MAX, V|E, "coder"},
-{"vlc", "variable length coder / huffman coder", 0, AV_OPT_TYPE_CONST, {.dbl =
FF_CODER_TYPE_VLC }, INT_MIN, INT_MAX, V|E, "coder"},
-{"ac", "arithmetic coder", 0, AV_OPT_TYPE_CONST, {.dbl = FF_CODER_TYPE_AC },
INT_MIN, INT_MAX, V|E, "coder"},
-{"raw", "raw (no encoding)", 0, AV_OPT_TYPE_CONST, {.dbl = FF_CODER_TYPE_RAW
}, INT_MIN, INT_MAX, V|E, "coder"},
-{"rle", "run-length coder", 0, AV_OPT_TYPE_CONST, {.dbl = FF_CODER_TYPE_RLE },
INT_MIN, INT_MAX, V|E, "coder"},
-{"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST, {.dbl =
FF_CODER_TYPE_DEFLATE }, INT_MIN, INT_MAX, V|E, "coder"},
{"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.dbl =
DEFAULT }, INT_MIN, INT_MAX, V|E},
{"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.dbl = DEFAULT },
INT_MIN, INT_MAX},
{"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), AV_OPT_TYPE_INT, {.dbl
= DEFAULT }, INT_MIN, INT_MAX},
-{"mbd", "macroblock decision algorithm (high quality mode)",
OFFSET(mb_decision), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E,
"mbd"},
-{"simple", "use mbcmp (default)", 0, AV_OPT_TYPE_CONST, {.dbl =
FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"},
-{"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.dbl = FF_MB_DECISION_BITS
}, INT_MIN, INT_MAX, V|E, "mbd"},
-{"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST, {.dbl =
FF_MB_DECISION_RD }, INT_MIN, INT_MAX, V|E, "mbd"},
{"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.dbl =
DEFAULT }, INT_MIN, INT_MAX},
{"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold),
AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
{"lmin", "min lagrange factor (VBR)", OFFSET(lmin), AV_OPT_TYPE_INT, {.dbl =
2*FF_QP2LAMBDA }, 0, INT_MAX, V|E},
@@ -342,17 +356,6 @@ static const AVOption options[]={
{"nssew", "nsse weight", OFFSET(nsse_weight), AV_OPT_TYPE_INT, {.dbl = 8 },
INT_MIN, INT_MAX, V|E},
{"skip_top", "number of macroblock rows at the top which are skipped",
OFFSET(skip_top), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|D},
{"skip_bottom", "number of macroblock rows at the bottom which are skipped",
OFFSET(skip_bottom), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|D},
-{"profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, {.dbl = FF_PROFILE_UNKNOWN
}, INT_MIN, INT_MAX, V|A|E, "profile"},
-{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_UNKNOWN }, INT_MIN,
INT_MAX, V|A|E, "profile"},
-{"aac_main", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_AAC_MAIN },
INT_MIN, INT_MAX, A|E, "profile"},
-{"aac_low", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_AAC_LOW }, INT_MIN,
INT_MAX, A|E, "profile"},
-{"aac_ssr", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_AAC_SSR }, INT_MIN,
INT_MAX, A|E, "profile"},
-{"aac_ltp", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_AAC_LTP }, INT_MIN,
INT_MAX, A|E, "profile"},
-{"dts", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_DTS }, INT_MIN,
INT_MAX, A|E, "profile"},
-{"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_DTS_ES }, INT_MIN,
INT_MAX, A|E, "profile"},
-{"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_DTS_96_24 },
INT_MIN, INT_MAX, A|E, "profile"},
-{"dts_hd_hra", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_DTS_HD_HRA },
INT_MIN, INT_MAX, A|E, "profile"},
-{"dts_hd_ma", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PROFILE_DTS_HD_MA },
INT_MIN, INT_MAX, A|E, "profile"},
{"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.dbl = FF_LEVEL_UNKNOWN },
INT_MIN, INT_MAX, V|A|E, "level"},
{"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_LEVEL_UNKNOWN }, INT_MIN,
INT_MAX, V|A|E, "level"},
{"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres),
AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, V|A|D},
--
1.7.7.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
