diff options
author | Dustin Brody <libav@parsoma.net> | 2011-08-06 04:42:34 +0000 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-08-12 19:10:22 +0200 |
commit | 2f63440c59bf8c4a2e90280e23e8cadb235a42e6 (patch) | |
tree | e2ef08ef74514f19a737dc5eaff5726e9742788c /libavformat/options.c | |
parent | 8d2e4a7e687b7fdbb939e236399cf774dc7bead6 (diff) | |
download | ffmpeg-2f63440c59bf8c4a2e90280e23e8cadb235a42e6.tar.gz |
lavf: add support for error_recognition, use it in avidec, and bump minor API version
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/options.c')
-rw-r--r-- | libavformat/options.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/options.c b/libavformat/options.c index 961162876f..3ca8c83480 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -87,6 +87,9 @@ static const AVOption options[]={ {"fdebug", "print specific debug info", OFFSET(debug), FF_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, 0, INT_MAX, E|D, "fdebug"}, {"ts", NULL, 0, FF_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), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, INT_MAX, E|D}, +{"fer", "set error detection aggressivity", OFFSET(error_recognition), FF_OPT_TYPE_INT, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, D, "fer"}, +{"careful", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, D, "fer"}, +{"explode", "abort decoding on error recognition", 0, FF_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), FF_OPT_TYPE_INT, {.dbl = -1}, -1, INT_MAX-1, D}, {NULL}, }; |