ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri 
Nov 29 23:32:24 2019 +0100| [4cfc563c5776f52f8d0b41602d63019bfa5f0373] | 
committer: Michael Niedermayer

avcodec/options_table: err_detect compliant and aggressive should also enable 
the weaker checks

Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cfc563c5776f52f8d0b41602d63019bfa5f0373
---

 libavcodec/options_table.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 4b9f3fff2b..d4c0cdeb48 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -141,8 +141,8 @@ static const AVOption avcodec_options[] = {
 {"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, 
{.i64 = AV_EF_EXPLODE }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
 {"ignore_err", "ignore errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_IGNORE_ERR 
}, INT_MIN, INT_MAX, A|V|D, "err_detect"},
 {"careful",    "consider things that violate the spec, are fast to check and 
have not been seen in the wild as errors", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_EF_CAREFUL }, INT_MIN, INT_MAX, A|V|D, "err_detect"},
-{"compliant",  "consider all spec non compliancies as errors", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT }, INT_MIN, INT_MAX, A|V|D, 
"err_detect"},
-{"aggressive", "consider things that a sane encoder should not do as an 
error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, 
A|V|D, "err_detect"},
+{"compliant",  "consider all spec non compliancies as errors", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT | AV_EF_CAREFUL }, INT_MIN, INT_MAX, 
A|V|D, "err_detect"},
+{"aggressive", "consider things that a sane encoder should not do as an 
error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE | AV_EF_COMPLIANT | 
AV_EF_CAREFUL}, INT_MIN, INT_MAX, A|V|D, "err_detect"},
 {"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT 
}, 0, INT_MAX},
 {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 
0, INT_MAX},
 #if FF_API_PRIVATE_OPT

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to