---
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 9535b88..9b1c8b6 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.1 - avcodec.h
+ Deprecate unused FF_IDCT_IPP define and ipp avcodec option.
+
2014-07-xx - xxxxxxx - lavu 53.18.0 - display.h
Add av_display_matrix_flip() to flip the transformation matrix.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8f93911..0a72407 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2455,7 +2455,9 @@ typedef struct AVCodecContext {
#define FF_IDCT_SH4 9
#endif
#define FF_IDCT_SIMPLEARM 10
+#if FF_API_IDCT_IPP
#define FF_IDCT_IPP 13
+#endif
#define FF_IDCT_XVIDMMX 14
#define FF_IDCT_SIMPLEARMV5TE 16
#define FF_IDCT_SIMPLEARMV6 17
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index c40a6ce..6d2dc30 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -207,7 +207,9 @@ static const AVOption avcodec_options[] = {
#if FF_API_ARCH_ALPHA
{"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA },
INT_MIN, INT_MAX, V|E|D, "idct"},
#endif
+#if FF_API_IDCT_IPP
{"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX,
V|E|D, "idct"},
+#endif
{"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVIDMMX }, INT_MIN,
INT_MAX, V|E|D, "idct"},
{"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 =
FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"},
{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT },
INT_MIN, INT_MAX},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 99ba631..d5ba46b 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 0
+#define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -129,6 +129,9 @@
#ifndef FF_API_ARCH_SPARC
#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_IDCT_IPP
+#define FF_API_IDCT_IPP (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
