---
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 12adfb6..2dc5e55 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.3 - avcodec.h
+ Deprecate unused FF_CODER_TYPE_DEFLATE define and deflate avcodec option.
+
2014-07-26 - xxxxxxx - lavc 55.56.2 - avcodec.h
Deprecate unused FF_DCT_INT define and int avcodec option.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index eb7e32a..4656d11 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2146,7 +2146,9 @@ typedef struct AVCodecContext {
#define FF_CODER_TYPE_AC 1
#define FF_CODER_TYPE_RAW 2
#define FF_CODER_TYPE_RLE 3
+#if FF_API_CODER_TYPE_DEFLATE
#define FF_CODER_TYPE_DEFLATE 4
+#endif
/**
* coder type
* - encoding: Set by user.
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 5727459..f1759b5 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -285,7 +285,9 @@ static const AVOption avcodec_options[] = {
{"ac", "arithmetic coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_AC },
INT_MIN, INT_MAX, V|E, "coder"},
{"raw", "raw (no encoding)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RAW
}, INT_MIN, INT_MAX, V|E, "coder"},
{"rle", "run-length coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RLE },
INT_MIN, INT_MAX, V|E, "coder"},
+#if FF_API_CODER_TYPE_DEFLATE
{"deflate", "deflate-based coder", 0, AV_OPT_TYPE_CONST, {.i64 =
FF_CODER_TYPE_DEFLATE }, INT_MIN, INT_MAX, V|E, "coder"},
+#endif
{"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 =
DEFAULT }, INT_MIN, INT_MAX, V|E},
{"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT },
INT_MIN, INT_MAX},
#if FF_API_XVMC
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 0cac4e8..d7cf35a 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 2
+#define LIBAVCODEC_VERSION_MICRO 3
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -135,6 +135,9 @@
#ifndef FF_API_DCT_INT
#define FF_API_DCT_INT (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_CODER_TYPE_DEFLATE
+#define FF_API_CODER_TYPE_DEFLATE (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
