---
 libavcodec/options.c |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 05e8fe8..a9e0509 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -143,6 +143,28 @@ static const AVOption options[]={
 {"ms",               "workaround various bugs in microsofts broken decoders",  
     0, AV_OPT_TYPE_CONST, {FF_BUG_MS},               0, 0, V|D, "bug"},
 {"trunc",            "trancated frames",                                       
     0, AV_OPT_TYPE_CONST, {FF_BUG_TRUNCATED},        0, 0, V|D, "bug"},
 
+{"strict", "how strictly to follow the standards", 
OFFSET(strict_std_compliance), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, 
INT_MAX, A|V|D|E, "strict"},
+{"very",         "strictly conform to a older more strict version of the spec 
or reference software", 0, AV_OPT_TYPE_CONST, {FF_COMPLIANCE_VERY_STRICT},  0, 
0, V|D|E, "strict"},
+{"strict",       "strictly conform to all the things in the spec no matter 
what consequences",        0, AV_OPT_TYPE_CONST, {FF_COMPLIANCE_STRICT},       
0, 0, V|D|E, "strict"},
+{"normal",       NULL,                                                         
                       0, AV_OPT_TYPE_CONST, {FF_COMPLIANCE_NORMAL},       0, 
0, V|D|E, "strict"},
+{"unofficial",   "allow unofficial extensions",                                
                       0, AV_OPT_TYPE_CONST, {FF_COMPLIANCE_UNOFFICIAL},   0, 
0, V|D|E, "strict"},
+{"experimental", "allow non standardized experimental things",                 
                       0, AV_OPT_TYPE_CONST, {FF_COMPLIANCE_EXPERIMENTAL}, 0, 
0, V|D|E, "strict"},
+
+{"err_detect", "set error detection flags", OFFSET(err_recognition), 
AV_OPT_TYPE_FLAGS, {.dbl = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, 
"err_detect"},
+{"crccheck",   "verify embedded CRCs",                      0, 
AV_OPT_TYPE_CONST, {AV_EF_CRCCHECK},  0, 0, V|D, "err_detect"},
+{"bitstream",  "detect bitstream specification deviations", 0, 
AV_OPT_TYPE_CONST, {AV_EF_BITSTREAM}, 0, 0, V|D, "err_detect"},
+{"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"},
+
+{"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"},
+{"int",     "accurate integer",                0, AV_OPT_TYPE_CONST, 
{FF_DCT_INT},     0, 0, V|E, "dct"},
+{"mmx",     NULL,                              0, AV_OPT_TYPE_CONST, 
{FF_DCT_MMX},     0, 0, V|E, "dct"},
+{"mlib",    NULL,                              0, AV_OPT_TYPE_CONST, 
{FF_DCT_MLIB},    0, 0, V|E, "dct"},
+{"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"},
+
 {"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},
@@ -174,18 +196,7 @@ static const AVOption options[]={
 {"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 
INT_MIN, INT_MAX},
 {"lelim", "single coefficient elimination threshold for luminance (negative 
values also consider dc coefficient)", OFFSET(luma_elim_threshold), 
AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"celim", "single coefficient elimination threshold for chrominance (negative 
values also consider dc coefficient)", OFFSET(chroma_elim_threshold), 
AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
-{"strict", "how strictly to follow the standards", 
OFFSET(strict_std_compliance), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, 
INT_MAX, A|V|D|E, "strict"},
-{"very", "strictly conform to a older more strict version of the spec or 
reference software", 0, AV_OPT_TYPE_CONST, {.dbl = FF_COMPLIANCE_VERY_STRICT }, 
INT_MIN, INT_MAX, V|D|E, "strict"},
-{"strict", "strictly conform to all the things in the spec no matter what 
consequences", 0, AV_OPT_TYPE_CONST, {.dbl = FF_COMPLIANCE_STRICT }, INT_MIN, 
INT_MAX, V|D|E, "strict"},
-{"normal", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_COMPLIANCE_NORMAL }, 
INT_MIN, INT_MAX, V|D|E, "strict"},
-{"unofficial", "allow unofficial extensions", 0, AV_OPT_TYPE_CONST, {.dbl = 
FF_COMPLIANCE_UNOFFICIAL }, INT_MIN, INT_MAX, V|D|E, "strict"},
-{"experimental", "allow non standardized experimental things", 0, 
AV_OPT_TYPE_CONST, {.dbl = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, 
V|D|E, "strict"},
 {"b_qoffset", "qp offset between P and B frames", OFFSET(b_quant_offset), 
AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E},
-{"err_detect", "set error detection flags", OFFSET(err_recognition), 
AV_OPT_TYPE_FLAGS, {.dbl = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, 
"err_detect"},
-{"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.dbl = 
AV_EF_CRCCHECK }, INT_MIN, INT_MAX, V|D, "err_detect"},
-{"bitstream", "detect bitstream specification deviations", 0, 
AV_OPT_TYPE_CONST, {.dbl = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, V|D, 
"err_detect"},
-{"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.dbl = 
AV_EF_BUFFER }, INT_MIN, INT_MAX, V|D, "err_detect"},
-{"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, 
{.dbl = AV_EF_EXPLODE }, INT_MIN, INT_MAX, V|D, "err_detect"},
 {"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.dbl = DEFAULT 
}, INT_MIN, INT_MAX},
 {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 
INT_MIN, INT_MAX},
 {"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), 
AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E},
@@ -203,14 +214,6 @@ static const AVOption options[]={
 {"i_qfactor", "qp factor between P and I frames", OFFSET(i_quant_factor), 
AV_OPT_TYPE_FLOAT, {.dbl = -0.8 }, -FLT_MAX, FLT_MAX, V|E},
 {"i_qoffset", "qp offset between P and I frames", OFFSET(i_quant_offset), 
AV_OPT_TYPE_FLOAT, {.dbl = 0.0 }, -FLT_MAX, FLT_MAX, V|E},
 {"rc_init_cplx", "initial complexity for 1-pass encoding", 
OFFSET(rc_initial_cplx), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, 
FLT_MAX, V|E},
-{"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, {.dbl = 
FF_DCT_AUTO }, INT_MIN, INT_MAX, V|E, "dct"},
-{"fastint", "fast integer", 0, AV_OPT_TYPE_CONST, {.dbl = FF_DCT_FASTINT }, 
INT_MIN, INT_MAX, V|E, "dct"},
-{"int", "accurate integer", 0, AV_OPT_TYPE_CONST, {.dbl = FF_DCT_INT }, 
INT_MIN, INT_MAX, V|E, "dct"},
-{"mmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_DCT_MMX }, INT_MIN, INT_MAX, 
V|E, "dct"},
-{"mlib", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_DCT_MLIB }, INT_MIN, INT_MAX, 
V|E, "dct"},
-{"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_DCT_ALTIVEC }, INT_MIN, 
INT_MAX, V|E, "dct"},
-{"faan", "floating point AAN DCT", 0, AV_OPT_TYPE_CONST, {.dbl = FF_DCT_FAAN 
}, INT_MIN, INT_MAX, V|E, "dct"},
 {"lumi_mask", "compresses bright areas stronger than medium ones", 
OFFSET(lumi_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E},
 {"tcplx_mask", "temporal complexity masking", OFFSET(temporal_cplx_masking), 
AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E},
 {"scplx_mask", "spatial complexity masking", OFFSET(spatial_cplx_masking), 
AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E},
-- 
1.7.7.3

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to