---
doc/avconv.texi | 6 ++----
doc/ffmpeg.texi | 4 +---
libavcodec/avcodec.h | 6 +++---
libavcodec/mpeg12.c | 3 +--
libavcodec/mpegaudiodec.c | 2 +-
libavcodec/options.c | 4 ++--
libavcodec/version.h | 4 ++--
7 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/doc/avconv.texi b/doc/avconv.texi
index d585db8..a4f85ad 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -437,10 +437,8 @@ Set error resilience to @var{n}.
FF_ER_CAREFUL (default)
@item 2
FF_ER_COMPLIANT
-@item 3
-FF_ER_AGGRESSIVE
-@item 4
-FF_ER_VERY_AGGRESSIVE
+@item 5
+FF_ER_EXPLODE
@end table
@item -ec @var{bit_mask}
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 2457d65..74df2d4 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -466,9 +466,7 @@ Set error resilience to @var{n}.
FF_ER_CAREFUL (default)
@item 2
FF_ER_COMPLIANT
-@item 3
-FF_ER_AGGRESSIVE
-@item 4
+@item 5
FF_ER_EXPLODE
@end table
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5a69c24..7b59c23 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1474,13 +1474,13 @@ typedef struct AVCodecContext {
int error_recognition;
#define FF_ER_CAREFUL 1
#define FF_ER_COMPLIANT 2
+#if FF_API_ER
#define FF_ER_AGGRESSIVE 3
-#if FF_API_VERY_AGGRESSIVE
#define FF_ER_VERY_AGGRESSIVE 4
#define FF_ER_EXPLODE 5
#else
-#define FF_ER_EXPLODE 4
-#endif /* FF_API_VERY_AGGRESSIVE */
+#define FF_ER_EXPLODE 3
+#endif /* FF_API_ER */
/**
* Called at the beginning of each frame to get a buffer for it.
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 6a12344..0a3da64 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1785,8 +1785,7 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y,
&& s->intra_dc_precision == 2 && s->q_scale_type
== 1 && s->alternate_scan == 0
&& s->progressive_frame == 0 /* vbv_delay ==
0xBBB || 0xE10*/;
- if (left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) &&
!is_d10)
- || (avctx->error_recognition >= FF_ER_AGGRESSIVE && left >
8)) {
+ if (left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) &&
!is_d10) || left > 8) {
av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n",
left, show_bits(&s->gb, FFMIN(left, 23)));
return -1;
} else
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 6f841e8..81943fd 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -1137,7 +1137,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef
*g,
if (bits_left < 0 && s->error_recognition >= FF_ER_COMPLIANT) {
av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
s_index=0;
- }else if(bits_left > 0 && s->error_recognition >= FF_ER_AGGRESSIVE){
+ }else if(bits_left > 0){
av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
s_index=0;
}
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 1c52406..176aff8 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -198,10 +198,10 @@ static const AVOption options[]={
{"er", "set error detection aggressivity", OFFSET(error_recognition),
FF_OPT_TYPE_INT, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, A|V|D, "er"},
{"careful", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_ER_CAREFUL }, INT_MIN,
INT_MAX, V|D, "er"},
{"compliant", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_ER_COMPLIANT }, INT_MIN,
INT_MAX, V|D, "er"},
+#if FF_API_ER
{"aggressive", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_ER_AGGRESSIVE },
INT_MIN, INT_MAX, V|D, "er"},
-#if FF_API_VERY_AGGRESSIVE
{"very_aggressive", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_ER_VERY_AGGRESSIVE
}, INT_MIN, INT_MAX, V|D, "er"},
-#endif /* FF_API_VERY_AGGRESSIVE */
+#endif /* FF_API_ER */
{"explode", "abort decoding on error recognition", 0, FF_OPT_TYPE_CONST, {.dbl
= FF_ER_EXPLODE }, INT_MIN, INT_MAX, V|D, "er"},
{"has_b_frames", NULL, OFFSET(has_b_frames), FF_OPT_TYPE_INT, {.dbl = DEFAULT
}, INT_MIN, INT_MAX},
{"block_align", NULL, OFFSET(block_align), FF_OPT_TYPE_INT, {.dbl = DEFAULT },
INT_MIN, INT_MAX},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index d9e60cc..90ec699 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -77,8 +77,8 @@
#ifndef FF_API_DRC_SCALE
#define FF_API_DRC_SCALE (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
-#ifndef FF_API_VERY_AGGRESSIVE
-#define FF_API_VERY_AGGRESSIVE (LIBAVCODEC_VERSION_MAJOR < 54)
+#ifndef FF_API_ER
+#define FF_API_ER (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_AVCODEC_INIT
#define FF_API_AVCODEC_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
--
1.7.2.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
