Deprecated in 10/2013.
---
libavcodec/avcodec.h | 9 ---------
libavcodec/mpegvideo_enc.c | 7 -------
libavcodec/options_table.h | 3 ---
libavcodec/version.h | 3 ---
4 files changed, 22 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1bcaf81..3aae707 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2934,15 +2934,6 @@ typedef struct AVCodecContext {
uint8_t *subtitle_header;
int subtitle_header_size;
-#if FF_API_ERROR_RATE
- /**
- * @deprecated use the 'error_rate' private AVOption of the mpegvideo
- * encoders
- */
- attribute_deprecated
- int error_rate;
-#endif
-
#if FF_API_VBV_DELAY
/**
* VBV delay coded in the last frame (in periods of a 27 MHz clock).
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 6a7c9e5..cde073d 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -894,13 +894,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
return ret;
}
-#if FF_API_ERROR_RATE
- FF_DISABLE_DEPRECATION_WARNINGS
- if (avctx->error_rate)
- s->error_rate = avctx->error_rate;
- FF_ENABLE_DEPRECATION_WARNINGS;
-#endif
-
#if FF_API_NORMALIZE_AQP
FF_DISABLE_DEPRECATION_WARNINGS
if (avctx->flags & CODEC_FLAG_NORMALIZE_AQP)
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 2ea50a7..9c677c0 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -316,9 +316,6 @@ static const AVOption avcodec_options[] = {
#endif
{"rc_init_occupancy", "number of bits which should be loaded into the rc
buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy),
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
{"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0,
UINT_MAX, V|A|E|D, "flags2"},
-#if FF_API_ERROR_RATE
-{"error", NULL, OFFSET(error_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT },
INT_MIN, INT_MAX, V|E},
-#endif
{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0,
INT_MAX, V|E|D, "threads"},
{"auto", "autodetect a suitable number of threads to use", 0,
AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
#if FF_API_MPV_OPT
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 8eb7a02..068c790 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time.
*/
-#ifndef FF_API_ERROR_RATE
-#define FF_API_ERROR_RATE (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_QSCALE_TYPE
#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
--
2.10.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
