Deprecated in 04/2014.
---
libavcodec/avcodec.h | 6 ------
libavcodec/libxvid.c | 6 ------
libavcodec/options_table.h | 3 ---
libavcodec/version.h | 3 ---
4 files changed, 18 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 4465ae7..1feed51 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -900,12 +900,6 @@ typedef struct RcOverride{
#define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed / advanced
prediction for H.263.
#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that
might be corrupted
#define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC.
-#if FF_API_GMC
-/**
- * @deprecated use the "gmc" private option of the libxvid encoder
- */
-#define CODEC_FLAG_GMC 0x0020 ///< Use GMC.
-#endif
#if FF_API_MV0
/**
* @deprecated use the flag "mv0" in the "mpv_flags" private option of the
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 9cbe9c1..fb7c4fb 100644
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -448,12 +448,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
break;
}
- /* Bring in VOL flags from avconv command-line */
-#if FF_API_GMC
- if (avctx->flags & CODEC_FLAG_GMC)
- x->gmc = 1;
-#endif
-
x->vol_flags = 0;
if (x->gmc) {
x->vol_flags |= XVID_VOL_GMC;
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index ba3428c..1bc91db 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -50,9 +50,6 @@ static const AVOption avcodec_options[] = {
{"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 =
AV_CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"},
{"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 =
AV_CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"},
{"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 =
AV_CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"},
-#if FF_API_GMC
-{"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN,
INT_MAX, V|E, "flags"},
-#endif
#if FF_API_MV0
{"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 =
CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"},
#endif
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 00e5918..8e3e307 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_GMC
-#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_MV0
#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
--
2.10.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
