---
libavcodec/avcodec.h | 9 ++++++---
libavcodec/options.c | 4 ++--
libavcodec/version.h | 4 ++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 2e37f5a..c327182 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1475,12 +1475,15 @@ typedef struct AVCodecContext {
#define FF_ER_CAREFUL 1
#define FF_ER_COMPLIANT 2
#define FF_ER_AGGRESSIVE 3
-#if FF_API_VERY_AGGRESSIVE
+#if FF_API_ER
#define FF_ER_VERY_AGGRESSIVE 4
#define FF_ER_EXPLODE 5
#else
-#define FF_ER_EXPLODE 4
-#endif /* FF_API_VERY_AGGRESSIVE */
+#define AV_ER_CRCCHECK (1<<0)
+#define AV_ER_BITSTREAM (1<<1)
+#define AV_ER_AGGRESSIVE (1<<2)
+#define AV_ER_EXPLODE (1<<3)
+#endif /* FF_API_ER */
/**
* Called at the beginning of each frame to get a buffer for it.
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 0bcdf2a..5a048bd 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -199,9 +199,9 @@ static const AVOption options[]={
{"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"},
{"aggressive", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_ER_AGGRESSIVE },
INT_MIN, INT_MAX, V|D, "er"},
-#if FF_API_VERY_AGGRESSIVE
+#if FF_API_ER
{"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 d745fae..9c90859 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
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
