summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-05 21:35:46 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-05 21:35:46 +0200
commit160e92c8bfad9b6b4748b0d5f72f15a097ad2dc3 (patch)
treedf85b33395b43f28d0d98c6bcf383705b74028b8
parent590ea32e54eebbf8d69c2e9d97d92727d22bb88a (diff)
parente88103a7f92cf27a2868b50acc8a9912f6088249 (diff)
downloadffmpeg-160e92c8bfad9b6b4748b0d5f72f15a097ad2dc3.tar.gz
Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249'
* commit 'e88103a7f92cf27a2868b50acc8a9912f6088249': Bump major versions of all libraries Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r--doc/APIchanges18
-rw-r--r--libavcodec/version.h4
-rw-r--r--libavdevice/version.h4
-rw-r--r--libavfilter/version.h6
-rw-r--r--libavformat/version.h6
-rw-r--r--libavresample/version.h4
-rw-r--r--libavutil/version.h4
-rw-r--r--libpostproc/version.h4
-rw-r--r--libswresample/version.h6
-rw-r--r--libswscale/version.h6
10 files changed, 31 insertions, 31 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 459fa5bc54..1377fd0283 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,15 +2,15 @@ Never assume the API of libav* to be stable unless at least 1 month has passed
since the last major version increase or the API was added.
The last version increases were:
-libavcodec: 2014-08-09
-libavdevice: 2014-08-09
-libavfilter: 2014-08-09
-libavformat: 2014-08-09
-libavresample: 2014-08-09
-libpostproc: 2014-08-09
-libswresample: 2014-08-09
-libswscale: 2014-08-09
-libavutil: 2014-08-09
+libavcodec: 2015-08-28
+libavdevice: 2015-08-28
+libavfilter: 2015-08-28
+libavformat: 2015-08-28
+libavresample: 2015-08-28
+libpostproc: 2015-08-28
+libswresample: 2015-08-28
+libswscale: 2015-08-28
+libavutil: 2015-08-28
API changes, most recent first:
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 0db852d37d..6d6ec6aa32 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
-#define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR 60
+#define LIBAVCODEC_VERSION_MAJOR 57
+#define LIBAVCODEC_VERSION_MINOR 0
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
diff --git a/libavdevice/version.h b/libavdevice/version.h
index 8de07f08b2..45c9e8d4db 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -27,8 +27,8 @@
#include "libavutil/version.h"
-#define LIBAVDEVICE_VERSION_MAJOR 56
-#define LIBAVDEVICE_VERSION_MINOR 4
+#define LIBAVDEVICE_VERSION_MAJOR 57
+#define LIBAVDEVICE_VERSION_MINOR 0
#define LIBAVDEVICE_VERSION_MICRO 100
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
diff --git a/libavfilter/version.h b/libavfilter/version.h
index d87548e173..5ef78dc82c 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -29,9 +29,9 @@
#include "libavutil/version.h"
-#define LIBAVFILTER_VERSION_MAJOR 5
-#define LIBAVFILTER_VERSION_MINOR 40
-#define LIBAVFILTER_VERSION_MICRO 101
+#define LIBAVFILTER_VERSION_MAJOR 6
+#define LIBAVFILTER_VERSION_MINOR 0
+#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavformat/version.h b/libavformat/version.h
index 3acb89864e..18be8b26b6 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -29,9 +29,9 @@
#include "libavutil/version.h"
-#define LIBAVFORMAT_VERSION_MAJOR 56
-#define LIBAVFORMAT_VERSION_MINOR 40
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MAJOR 57
+#define LIBAVFORMAT_VERSION_MINOR 0
+#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
diff --git a/libavresample/version.h b/libavresample/version.h
index 6a6cb2fbfe..b5b0e2d7aa 100644
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -27,8 +27,8 @@
#include "libavutil/version.h"
-#define LIBAVRESAMPLE_VERSION_MAJOR 2
-#define LIBAVRESAMPLE_VERSION_MINOR 1
+#define LIBAVRESAMPLE_VERSION_MAJOR 3
+#define LIBAVRESAMPLE_VERSION_MINOR 0
#define LIBAVRESAMPLE_VERSION_MICRO 0
#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \
diff --git a/libavutil/version.h b/libavutil/version.h
index 108e1c7849..fac4a5dc95 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -55,8 +55,8 @@
* @{
*/
-#define LIBAVUTIL_VERSION_MAJOR 54
-#define LIBAVUTIL_VERSION_MINOR 31
+#define LIBAVUTIL_VERSION_MAJOR 55
+#define LIBAVUTIL_VERSION_MINOR 0
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libpostproc/version.h b/libpostproc/version.h
index ed18446c56..db557a5b81 100644
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -28,8 +28,8 @@
#include "libavutil/avutil.h"
-#define LIBPOSTPROC_VERSION_MAJOR 53
-#define LIBPOSTPROC_VERSION_MINOR 3
+#define LIBPOSTPROC_VERSION_MAJOR 54
+#define LIBPOSTPROC_VERSION_MINOR 0
#define LIBPOSTPROC_VERSION_MICRO 100
#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
diff --git a/libswresample/version.h b/libswresample/version.h
index cc0a77de28..12b32826db 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -28,9 +28,9 @@
#include "libavutil/avutil.h"
-#define LIBSWRESAMPLE_VERSION_MAJOR 1
-#define LIBSWRESAMPLE_VERSION_MINOR 2
-#define LIBSWRESAMPLE_VERSION_MICRO 101
+#define LIBSWRESAMPLE_VERSION_MAJOR 2
+#define LIBSWRESAMPLE_VERSION_MINOR 0
+#define LIBSWRESAMPLE_VERSION_MICRO 100
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
LIBSWRESAMPLE_VERSION_MINOR, \
diff --git a/libswscale/version.h b/libswscale/version.h
index 93a458ee5d..24908b8931 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -26,9 +26,9 @@
#include "libavutil/version.h"
-#define LIBSWSCALE_VERSION_MAJOR 3
-#define LIBSWSCALE_VERSION_MINOR 1
-#define LIBSWSCALE_VERSION_MICRO 101
+#define LIBSWSCALE_VERSION_MAJOR 4
+#define LIBSWSCALE_VERSION_MINOR 0
+#define LIBSWSCALE_VERSION_MICRO 100
#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
LIBSWSCALE_VERSION_MINOR, \