---
 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 2dc5e55..1f55c6f 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.4 - avcodec.h
+  Deprecate unused FF_DEBUG_PTS define and pts avcodec option.
+
 2014-07-26 - xxxxxxx - lavc 55.56.3 - avcodec.h
   Deprecate unused FF_CODER_TYPE_DEFLATE define and deflate avcodec option.
 
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 4656d11..365b447 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2353,7 +2353,9 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_DCT_COEFF   0x00000040
 #define FF_DEBUG_SKIP        0x00000080
 #define FF_DEBUG_STARTCODE   0x00000100
+#if FF_API_DEBUG_PTS
 #define FF_DEBUG_PTS         0x00000200
+#endif
 #define FF_DEBUG_ER          0x00000400
 #define FF_DEBUG_MMCO        0x00000800
 #define FF_DEBUG_BUGS        0x00001000
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index f1759b5..7188745 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -236,7 +236,9 @@ static const AVOption avcodec_options[] = {
 {"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, 
INT_MIN, INT_MAX, V|D, "debug"},
 {"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, 
INT_MAX, V|D, "debug"},
 {"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, 
INT_MIN, INT_MAX, V|D, "debug"},
+#if FF_API_DEBUG_PTS
 {"pts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PTS }, INT_MIN, INT_MAX, 
V|D, "debug"},
+#endif
 {"er", "error recognition", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_ER }, 
INT_MIN, INT_MAX, V|D, "debug"},
 {"mmco", "memory management control operations (H.264)", 0, AV_OPT_TYPE_CONST, 
{.i64 = FF_DEBUG_MMCO }, INT_MIN, INT_MAX, V|D, "debug"},
 {"bugs", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUGS }, INT_MIN, 
INT_MAX, V|D, "debug"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index d7cf35a..1a99786 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  3
+#define LIBAVCODEC_VERSION_MICRO  4
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
@@ -138,6 +138,9 @@
 #ifndef FF_API_CODER_TYPE_DEFLATE
 #define FF_API_CODER_TYPE_DEFLATE (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_DEBUG_PTS
+#define FF_API_DEBUG_PTS         (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

Reply via email to