[FFmpeg-cvslog] lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE

[Dustin Brody]

ffmpeg | branch: master | Dustin Brody <libav at parsoma.net> | Fri Jul 29 03:25:34 2011 -0400| [18cb40f074ec7e79b20bf9b8c8f19c55784a071c] | committer: Ronald S. Bultje

lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

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

 doc/ffmpeg.texi      |    2 --
 libavcodec/avcodec.h |    4 ++++
 libavcodec/options.c |    2 ++
 libavcodec/version.h |    3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index f3a4689..ca801d3 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -469,8 +469,6 @@ FF_ER_COMPLIANT
 @item 3
 FF_ER_AGGRESSIVE
 @item 4
-FF_ER_VERY_AGGRESSIVE
- at item 5
 FF_ER_EXPLODE
 @end table
 
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 75c107c..e1fd475 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1445,8 +1445,12 @@ typedef struct AVCodecContext {
 #define FF_ER_CAREFUL         1
 #define FF_ER_COMPLIANT       2
 #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 */
 
     /**
      * Called at the beginning of each frame to get a buffer for it.
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 0f0ca2a..1ee02c0 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -183,7 +183,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
 {"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 */
 {"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 8d40899..46e5499 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -77,5 +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)
+#endif
 
 #endif /* AVCODEC_VERSION_H */