ref: 748a4fd638f1241b20bfca55cf857447e5e4425d
parent: b708f3b9ec55fedfc60aa1bc60b3877096846a5e
parent: e4aa19a81d5917bee6be948f54f000bc48dae0a8
author: James Zern <jzern@google.com>
date: Thu Mar 19 19:33:53 EDT 2015
Merge changes I42fa121b,Id30076ce * changes: vpx/vpx_codec.h: bump ABI version vpx/vpx_encoder.h: bump ABI version
--- a/vpx/vpx_codec.h
+++ b/vpx/vpx_codec.h
@@ -83,7 +83,7 @@
* types, removing or reassigning enums, adding/removing/rearranging
* fields to structures
*/
-#define VPX_CODEC_ABI_VERSION (2 + VPX_IMAGE_ABI_VERSION) /**<\hideinitializer*/
+#define VPX_CODEC_ABI_VERSION (3 + VPX_IMAGE_ABI_VERSION) /**<\hideinitializer*/
/*!\brief Algorithm return codes */
typedef enum {
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -59,7 +59,7 @@
* types, removing or reassigning enums, adding/removing/rearranging
* fields to structures
*/
-#define VPX_ENCODER_ABI_VERSION (3 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
+#define VPX_ENCODER_ABI_VERSION (4 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
/*! \brief Encoder capabilities bitfield