---
 libavformat/options.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavformat/options.c b/libavformat/options.c
index a9e2c1c..39847db 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -109,10 +109,13 @@ 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 (deprecated; use err_detect, save 
via avconv)", OFFSET(error_recognition), AV_OPT_TYPE_FLAGS, {.dbl = 
AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, "err_detect"}, /* avconv only */
+{"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"},
 {NULL},
 };
 
-- 
1.7.2.5

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to