On Tue, 17 Jan 2012 15:06:27 -0500, Dustin Brody <[email protected]> wrote: > --- > libavformat/options.c | 13 ++++++++++--- > 1 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/libavformat/options.c b/libavformat/options.c > index a9e2c1c..2f34a7b 100644 > --- a/libavformat/options.c > +++ b/libavformat/options.c > @@ -109,10 +109,17 @@ static const AVOption options[]={ > {"fdebug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, > {.dbl = DEFAULT }, 0, INT_MAX, E|D, "fdebug"}, > {"ts", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_FDEBUG_TS }, INT_MIN, INT_MAX, > E|D, "fdebug"}, > {"max_delay", "maximum muxing or demuxing delay in microseconds", > OFFSET(max_delay), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, INT_MAX, E|D}, > -{"fer", "set error detection aggressivity", OFFSET(error_recognition), > AV_OPT_TYPE_INT, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, D, "fer"}, > -{"careful", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_CAREFUL }, INT_MIN, > INT_MAX, D, "fer"}, > -{"explode", "abort decoding on error recognition", 0, AV_OPT_TYPE_CONST, > {.dbl = FF_ER_EXPLODE }, INT_MIN, INT_MAX, D, "fer"}, > {"fpsprobesize", "number of frames used to probe fps", > OFFSET(fps_probe_size), AV_OPT_TYPE_INT, {.dbl = -1}, -1, INT_MAX-1, D}, > +{"f_err_detect", "set error detection flags", OFFSET(error_recognition), > AV_OPT_TYPE_FLAGS, {.dbl = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, > "f_err_detect"}, > +{"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.dbl = > AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, "f_err_detect"}, > +{"bitstream", "detect bitstream specification deviations", 0, > AV_OPT_TYPE_CONST, {.dbl = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, D, > "f_err_detect"}, > +{"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.dbl = > AV_EF_BUFFER }, INT_MIN, INT_MAX, D, "f_err_detect"}, > +{"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, > {.dbl = AV_EF_EXPLODE }, INT_MIN, INT_MAX, D, "f_err_detect"}, > +{"err_detect", "set error detection flags", OFFSET(error_recognition), > AV_OPT_TYPE_FLAGS, {.dbl = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, > "err_detect"}, > +{"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.dbl = > AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, "err_detect"}, > +{"bitstream", "detect bitstream specification deviations", 0, > AV_OPT_TYPE_CONST, {.dbl = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, D, > "err_detect"}, > +{"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.dbl = > AV_EF_BUFFER }, INT_MIN, INT_MAX, D, "err_detect"}, > +{"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, > {.dbl = AV_EF_EXPLODE }, INT_MIN, INT_MAX, D, "err_detect"},
You don't need to duplicate the named constants. Just set the same unit (the last field) for them. Also, mention in the f_err_detect docs that it's a crutch for avconv and people should use err_detect when possible. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
