Deprecated in 04/2014.
---
libavcodec/avcodec.h | 7 -------
libavcodec/mpegvideo_enc.c | 7 -------
libavcodec/options_table.h | 3 ---
libavcodec/version.h | 3 ---
4 files changed, 20 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 073250a..4465ae7 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -919,13 +919,6 @@ typedef struct RcOverride{
#define CODEC_FLAG_PSNR 0x8000 ///< error[?] variables will be
set during encoding.
#define CODEC_FLAG_TRUNCATED 0x00010000 /** Input bitstream might be
truncated at a random
location instead of only at
frame boundaries. */
-#if FF_API_NORMALIZE_AQP
-/**
- * @deprecated use the flag "naq" in the "mpv_flags" private option of the
- * mpegvideo encoders
- */
-#define CODEC_FLAG_NORMALIZE_AQP 0x00020000
-#endif
#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
#define CODEC_FLAG_LOW_DELAY 0x00080000 ///< Force low delay.
#define CODEC_FLAG_GLOBAL_HEADER 0x00400000 ///< Place global headers in
extradata instead of every keyframe.
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index cde073d..dd6235a 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -894,13 +894,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
return ret;
}
-#if FF_API_NORMALIZE_AQP
- FF_DISABLE_DEPRECATION_WARNINGS
- if (avctx->flags & CODEC_FLAG_NORMALIZE_AQP)
- s->mpv_flags |= FF_MPV_FLAG_NAQ;
- FF_ENABLE_DEPRECATION_WARNINGS;
-#endif
-
#if FF_API_MV0
FF_DISABLE_DEPRECATION_WARNINGS
if (avctx->flags & CODEC_FLAG_MV0)
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 362e31c..ba3428c 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -61,9 +61,6 @@ static const AVOption avcodec_options[] = {
{"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 =
AV_CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"},
{"psnr", "error[?] variables will be set during encoding", 0,
AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E,
"flags"},
{"truncated", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_TRUNCATED },
INT_MIN, INT_MAX, 0, "flags"},
-#if FF_API_NORMALIZE_AQP
-{"naq", "normalize adaptive quantization", 0, AV_OPT_TYPE_CONST, {.i64 =
CODEC_FLAG_NORMALIZE_AQP }, INT_MIN, INT_MAX, V|E, "flags"},
-#endif
{"ildct", "use interlaced DCT", 0, AV_OPT_TYPE_CONST, {.i64 =
AV_CODEC_FLAG_INTERLACED_DCT }, INT_MIN, INT_MAX, V|E, "flags"},
{"low_delay", "force low delay", 0, AV_OPT_TYPE_CONST, {.i64 =
AV_CODEC_FLAG_LOW_DELAY }, INT_MIN, INT_MAX, V|D|E, "flags"},
{"global_header", "place global headers in extradata instead of every
keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_GLOBAL_HEADER },
INT_MIN, INT_MAX, V|A|E, "flags"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2481ae8..00e5918 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_NORMALIZE_AQP
-#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_GMC
#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
--
2.10.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
