Signed-off-by: Vittorio Giovara <[email protected]>
---
 doc/APIchanges       | 5 +++++
 libavcodec/avcodec.h | 4 ++++
 libavcodec/version.h | 7 +++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 3303d5f..401e729 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,11 @@ libavutil:     2014-08-09
 
 API changes, most recent first:
 
+2015-xx-xx - lavc 56.34.0 - avcodec.h
+  xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*.
+  xxxxxxxxx - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*.
+  xxxxxxxxx - Rename input buffer defines to AV-prefixed versions.
+
 2015-xx-xx - xxxxxxx - lavc 56.33.0 - avcodec.h
   Add AV_PKT_DATA_QUALITY_FACTOR to export the quality value of an AVPacket.
 
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8e5a228..5bf9833 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -544,6 +544,7 @@ typedef struct AVCodecDescriptor {
  */
 #define AV_INPUT_BUFFER_MIN_SIZE 16384
 
+#if FF_API_WITHOUT_PREFIX
 /**
  * @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead
  */
@@ -553,6 +554,7 @@ typedef struct AVCodecDescriptor {
  * @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead
  */
 #define FF_MIN_BUFFER_SIZE 16384
+#endif /* FF_API_WITHOUT_PREFIX */
 
 /**
  * @ingroup lavc_encoding
@@ -806,6 +808,7 @@ typedef struct RcOverride{
  */
 #define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
 
+#if FF_API_WITHOUT_PREFIX
 /**
  * Allow decoders to produce frames with data planes that are not aligned
  * to CPU requirements (e.g. due to cropping).
@@ -972,6 +975,7 @@ typedef struct RcOverride{
  * Audio encoder supports receiving a different number of samples in each call.
  */
 #define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
+#endif /* FF_API_WITHOUT_PREFIX */
 
 #if FF_API_MB_TYPE
 //The following defines may change, don't expect compatibility if you use them.
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b88a385..0100027 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,8 +29,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR 33
-#define LIBAVCODEC_VERSION_MICRO  1
+#define LIBAVCODEC_VERSION_MINOR 34
+#define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
@@ -177,5 +177,8 @@
 #ifndef FF_API_MOTION_EST
 #define FF_API_MOTION_EST        (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
+#ifndef FF_API_WITHOUT_PREFIX
+#define FF_API_WITHOUT_PREFIX    (LIBAVCODEC_VERSION_MAJOR < 59)
+#endif
 
 #endif /* AVCODEC_VERSION_H */
-- 
1.9.5 (Apple Git-50.3)

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to