---
libavcodec/options.c | 59 ++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/libavcodec/options.c b/libavcodec/options.c
index a9e0509..194a334 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -125,6 +125,11 @@ static const AVOption options[]={
{"umh", "umh motion estimation", 0, AV_OPT_TYPE_CONST,
{ME_UMH}, 0, 0, V|E, "me_method" },
{"iter", "iter motion estimation", 0, AV_OPT_TYPE_CONST,
{ME_ITER}, 0, 0, V|E, "me_method" },
+{"pred", "prediction method", OFFSET(prediction_method), AV_OPT_TYPE_INT,
{.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E, "pred"},
+{"left", NULL, 0, AV_OPT_TYPE_CONST, {FF_PRED_LEFT}, 0, 0, V|E, "pred"},
+{"plane", NULL, 0, AV_OPT_TYPE_CONST, {FF_PRED_PLANE}, 0, 0, V|E, "pred"},
+{"median", NULL, 0, AV_OPT_TYPE_CONST, {FF_PRED_MEDIAN}, 0, 0, V|E, "pred"},
+
{"bug", "workaround not auto detected encoder bugs", OFFSET(workaround_bugs),
AV_OPT_TYPE_FLAGS, {.dbl = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"},
{"autodetect", NULL,
0, AV_OPT_TYPE_CONST, {FF_BUG_AUTODETECT}, 0, 0, V|D, "bug"},
{"old_msmpeg4", "some old lavc generated msmpeg4v3 files (no
autodetection)", 0, AV_OPT_TYPE_CONST, {FF_BUG_OLD_MSMPEG4}, 0, 0, V|D,
"bug"},
@@ -156,6 +161,10 @@ static const AVOption options[]={
{"buffer", "detect improper bitstream length", 0,
AV_OPT_TYPE_CONST, {AV_EF_BUFFER}, 0, 0, V|D, "err_detect"},
{"explode", "abort decoding on minor error detection", 0,
AV_OPT_TYPE_CONST, {AV_EF_EXPLODE}, 0, 0, V|D, "err_detect"},
+{"ec", "set error concealment strategy", OFFSET(error_concealment),
AV_OPT_TYPE_FLAGS, {.dbl = 3 }, INT_MIN, INT_MAX, V|D, "ec"},
+{"guess_mvs", "iterative motion vector (MV) search (slow)", 0,
AV_OPT_TYPE_CONST, {FF_EC_GUESS_MVS}, 0, 0, V|D, "ec"},
+{"deblock", "use strong deblock filter for damaged MBs", 0,
AV_OPT_TYPE_CONST, {FF_EC_DEBLOCK}, 0, 0, V|D, "ec"},
+
{"dct", "DCT algorithm", OFFSET(dct_algo), AV_OPT_TYPE_INT, {.dbl = DEFAULT },
0, INT_MAX, V|E, "dct"},
{"auto", "autoselect a good one (default)", 0, AV_OPT_TYPE_CONST,
{FF_DCT_AUTO}, 0, 0, V|E, "dct"},
{"fastint", "fast integer", 0, AV_OPT_TYPE_CONST,
{FF_DCT_FASTINT}, 0, 0, V|E, "dct"},
@@ -165,6 +174,28 @@ static const AVOption options[]={
{"altivec", NULL, 0, AV_OPT_TYPE_CONST,
{FF_DCT_ALTIVEC}, 0, 0, V|E, "dct"},
{"faan", "floating point AAN DCT", 0, AV_OPT_TYPE_CONST,
{FF_DCT_FAAN}, 0, 0, V|E, "dct"},
+{"idct", "select IDCT implementation", OFFSET(idct_algo), AV_OPT_TYPE_INT,
{.dbl = DEFAULT }, 0, INT_MAX, V|E|D, "idct"},
+{"auto", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_AUTO}, 0, 0, V|E|D, "idct"},
+{"int", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_INT}, 0, 0, V|E|D, "idct"},
+{"simple", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_SIMPLE}, 0, 0, V|E|D, "idct"},
+{"simplemmx", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_SIMPLEMMX}, 0, 0, V|E|D, "idct"},
+{"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_LIBMPEG2MMX}, 0, 0, V|E|D, "idct"},
+{"ps2", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_PS2}, 0, 0, V|E|D, "idct"},
+{"mlib", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_MLIB}, 0, 0, V|E|D, "idct"},
+{"arm", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_ARM}, 0, 0, V|E|D, "idct"},
+{"altivec", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_ALTIVEC}, 0, 0, V|E|D, "idct"},
+{"sh4", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_SH4}, 0, 0, V|E|D, "idct"},
+{"simplearm", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_SIMPLEARM}, 0, 0, V|E|D, "idct"},
+{"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_SIMPLEARMV5TE}, 0, 0, V|E|D, "idct"},
+{"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_SIMPLEARMV6}, 0, 0, V|E|D, "idct"},
+{"simpleneon", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_SIMPLENEON}, 0, 0, V|E|D, "idct"},
+{"simplealpha", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_SIMPLEALPHA}, 0, 0, V|E|D, "idct"},
+{"h264", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_H264}, 0, 0, V|E|D, "idct"},
+{"vp3", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_VP3}, 0, 0, V|E|D, "idct"},
+{"ipp", NULL, 0, AV_OPT_TYPE_CONST,
{FF_IDCT_IPP}, 0, 0, V|E|D, "idct"},
+{"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"},
+
{"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},
@@ -219,36 +250,8 @@ static const AVOption options[]={
{"scplx_mask", "spatial complexity masking", OFFSET(spatial_cplx_masking),
AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E},
{"p_mask", "inter masking", OFFSET(p_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 },
-FLT_MAX, FLT_MAX, V|E},
{"dark_mask", "compresses dark areas stronger than medium ones",
OFFSET(dark_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E},
-{"idct", "select IDCT implementation", OFFSET(idct_algo), AV_OPT_TYPE_INT,
{.dbl = DEFAULT }, 0, INT_MAX, V|E|D, "idct"},
-{"auto", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_AUTO }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"int", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_INT }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"simple", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLE }, INT_MIN,
INT_MAX, V|E|D, "idct"},
-{"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEMMX },
INT_MIN, INT_MAX, V|E|D, "idct"},
-{"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_LIBMPEG2MMX },
INT_MIN, INT_MAX, V|E|D, "idct"},
-{"ps2", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_PS2 }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"mlib", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_MLIB }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"arm", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_ARM }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_ALTIVEC }, INT_MIN,
INT_MAX, V|E|D, "idct"},
-{"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SH4 }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"simplearm", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEARM },
INT_MIN, INT_MAX, V|E|D, "idct"},
-{"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEARMV5TE },
INT_MIN, INT_MAX, V|E|D, "idct"},
-{"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEARMV6 },
INT_MIN, INT_MAX, V|E|D, "idct"},
-{"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLENEON },
INT_MIN, INT_MAX, V|E|D, "idct"},
-{"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEALPHA },
INT_MIN, INT_MAX, V|E|D, "idct"},
-{"h264", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_H264 }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"vp3", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_VP3 }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_IPP }, INT_MIN, INT_MAX,
V|E|D, "idct"},
-{"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_XVIDMMX }, INT_MIN,
INT_MAX, V|E|D, "idct"},
-{"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.dbl =
FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"},
{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.dbl = DEFAULT },
INT_MIN, INT_MAX},
-{"ec", "set error concealment strategy", OFFSET(error_concealment),
AV_OPT_TYPE_FLAGS, {.dbl = 3 }, INT_MIN, INT_MAX, V|D, "ec"},
-{"guess_mvs", "iterative motion vector (MV) search (slow)", 0,
AV_OPT_TYPE_CONST, {.dbl = FF_EC_GUESS_MVS }, INT_MIN, INT_MAX, V|D, "ec"},
-{"deblock", "use strong deblock filter for damaged MBs", 0, AV_OPT_TYPE_CONST,
{.dbl = FF_EC_DEBLOCK }, INT_MIN, INT_MAX, V|D, "ec"},
{"bits_per_coded_sample", NULL, OFFSET(bits_per_coded_sample),
AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},
-{"pred", "prediction method", OFFSET(prediction_method), AV_OPT_TYPE_INT,
{.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E, "pred"},
-{"left", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PRED_LEFT }, INT_MIN, INT_MAX,
V|E, "pred"},
-{"plane", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PRED_PLANE }, INT_MIN,
INT_MAX, V|E, "pred"},
-{"median", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_PRED_MEDIAN }, INT_MIN,
INT_MAX, V|E, "pred"},
{"aspect", "sample aspect ratio", OFFSET(sample_aspect_ratio),
AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E},
{"debug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.dbl
= DEFAULT }, 0, INT_MAX, V|A|S|E|D, "debug"},
{"pict", "picture info", 0, AV_OPT_TYPE_CONST, {.dbl = FF_DEBUG_PICT_INFO },
INT_MIN, INT_MAX, V|D, "debug"},
--
1.7.7.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
