lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Signed-off-by: Anton Khirnov <anton@khirnov.net>

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5a69c24..56d48a4 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1475,12 +1475,12 @@ 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 */
+#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 80e2304..75a1164 100644 (file)
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -204,9 +204,9 @@ static const AVOption options[]={
 {"careful", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_CAREFUL }, INT_MIN, INT_MAX, V|D, "er"},
 {"compliant", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_ER_COMPLIANT }, INT_MIN, INT_MAX, V|D, "er"},
 {"aggressive", NULL, 0, AV_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, AV_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, AV_OPT_TYPE_CONST, {.dbl = FF_ER_EXPLODE }, INT_MIN, INT_MAX, V|D, "er"},
 {"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},
 {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 5657511..ee647be 100644 (file)
--- 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)