[FFmpeg-devel] [PATCH 2/2] avformat/options_table: set err_detect to careful by default

[Michael Niedermayer]

This ensures that checks that are a reliable and fast way to detect errors
are enabled and can trigger error concealment so as to improve the
presentation of damaged files.

It also makes it consistent with libavcodec.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 doc/APIchanges              |    3 +++
 libavformat/options_table.h |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index e44a8b8..90cc0f9 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2012-10-22
 
 API changes, most recent first:
 
+2013-10-XX - xxxxxxx - lavf 55.XX.XXX - avformat.h
+  Change default err_recognition to AV_EF_CAREFUL
+
 2013-10-XX - xxxxxxx - lavc 55.XX.XXX - avcodec.h
   Change default err_recognition to AV_EF_CAREFUL
 
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index 8145325..3739a70 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -63,8 +63,8 @@ static const AVOption avformat_options[] = {
 {"chunk_size", "size in bytes for each chunk", OFFSET(max_chunk_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, E},
 /* this is a crutch for avconv, since it cannot deal with identically named options in different contexts.
  * to be removed when avconv is fixed */
-{"f_err_detect", "set error detection flags (deprecated; use err_detect, save via avconv)", OFFSET(error_recognition), AV_OPT_TYPE_FLAGS, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, "err_detect"},
-{"err_detect", "set error detection flags", OFFSET(error_recognition), AV_OPT_TYPE_FLAGS, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, "err_detect"},
+{"f_err_detect", "set error detection flags (deprecated; use err_detect, save via avconv)", OFFSET(error_recognition), AV_OPT_TYPE_FLAGS, {.i64 = AV_EF_CAREFUL }, INT_MIN, INT_MAX, D, "err_detect"},
+{"err_detect", "set error detection flags", OFFSET(error_recognition), AV_OPT_TYPE_FLAGS, {.i64 = AV_EF_CAREFUL }, INT_MIN, INT_MAX, D, "err_detect"},
 {"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, D, "err_detect"},
 {"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, D, "err_detect"},
 {"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, D, "err_detect"},
-- 
1.7.9.5