---
doc/APIchanges | 3 +++
libavcodec/avcodec.h | 2 ++
libavcodec/options_table.h | 2 ++
libavcodec/version.h | 5 ++++-
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 9b1c8b6..12adfb6 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
API changes, most recent first:
+2014-07-26 - xxxxxxx - lavc 55.56.2 - avcodec.h
+ Deprecate unused FF_DCT_INT define and int avcodec option.
+
2014-07-26 - xxxxxxx - lavc 55.56.1 - avcodec.h
Deprecate unused FF_IDCT_IPP define and ipp avcodec option.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 0a72407..eb7e32a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2434,7 +2434,9 @@ typedef struct AVCodecContext {
int dct_algo;
#define FF_DCT_AUTO 0
#define FF_DCT_FASTINT 1
+#if FF_API_DCT_INT
#define FF_DCT_INT 2
+#endif
#define FF_DCT_MMX 3
#define FF_DCT_ALTIVEC 5
#define FF_DCT_FAAN 6
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 6d2dc30..5727459 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -192,7 +192,9 @@ static const AVOption avcodec_options[] = {
{"dark_mask", "compresses dark areas stronger than medium ones",
OFFSET(dark_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, V|E},
{"idct", "select IDCT implementation", OFFSET(idct_algo), AV_OPT_TYPE_INT,
{.i64 = DEFAULT }, 0, INT_MAX, V|E|D, "idct"},
{"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_AUTO }, INT_MIN, INT_MAX,
V|E|D, "idct"},
+#if FF_API_DCT_INT
{"int", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_INT }, INT_MIN, INT_MAX,
V|E|D, "idct"},
+#endif
{"simple", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLE }, INT_MIN,
INT_MAX, V|E|D, "idct"},
{"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX },
INT_MIN, INT_MAX, V|E|D, "idct"},
{"arm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ARM }, INT_MIN, INT_MAX,
V|E|D, "idct"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index d5ba46b..0cac4e8 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 56
-#define LIBAVCODEC_VERSION_MICRO 1
+#define LIBAVCODEC_VERSION_MICRO 2
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -132,6 +132,9 @@
#ifndef FF_API_IDCT_IPP
#define FF_API_IDCT_IPP (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_DCT_INT
+#define FF_API_DCT_INT (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
#ifndef FF_API_INPUT_PRESERVED
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
