diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 00:26:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 00:26:45 +0200 |
| commit | a57ece0cb48ba131a2d6ba9d4525d9195238f18c (patch) | |
| tree | f8cf30fc37742977986cef12f616ebd15869c9d0 | |
| parent | 80c1cb522c9779c3e799fbe2fc5e19a53bfd079f (diff) | |
| parent | 1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8 (diff) | |
Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
Bump major versions of all libraries.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 14 | ||||
| -rw-r--r-- | libavcodec/version.h | 6 | ||||
| -rw-r--r-- | libavdevice/version.h | 6 | ||||
| -rw-r--r-- | libavfilter/version.h | 6 | ||||
| -rw-r--r-- | libavformat/version.h | 5 | ||||
| -rw-r--r-- | libavresample/version.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 4 | ||||
| -rw-r--r-- | libswscale/version.h | 6 |
8 files changed, 25 insertions, 26 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 024ba3a4a8..4030428e0e 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: 2013-03-xx -libavdevice: 2013-03-xx -libavfilter: 2013-12-xx -libavformat: 2013-03-xx -libavresample: 2012-10-05 +libavcodec: 2014-08-09 +libavdevice: 2014-08-09 +libavfilter: 2014-08-09 +libavformat: 2014-08-09 +libavresample: 2014-08-09 libpostproc: 2011-04-18 libswresample: 2011-09-19 -libswscale: 2011-06-20 -libavutil: 2012-10-22 +libswscale: 2014-08-09 +libavutil: 2014-08-09 API changes, most recent first: diff --git a/libavcodec/version.h b/libavcodec/version.h index 503fddcc6a..ffecae03e8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,9 +28,9 @@ #include "libavutil/version.h" -#define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 73 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MAJOR 56 +#define LIBAVCODEC_VERSION_MINOR 0 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavdevice/version.h b/libavdevice/version.h index a098549593..4529c641eb 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -27,9 +27,9 @@ #include "libavutil/version.h" -#define LIBAVDEVICE_VERSION_MAJOR 55 -#define LIBAVDEVICE_VERSION_MINOR 13 -#define LIBAVDEVICE_VERSION_MICRO 102 +#define LIBAVDEVICE_VERSION_MAJOR 56 +#define LIBAVDEVICE_VERSION_MINOR 0 +#define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ diff --git a/libavfilter/version.h b/libavfilter/version.h index 632e90448d..2003b76ba1 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,9 +29,9 @@ #include "libavutil/version.h" -#define LIBAVFILTER_VERSION_MAJOR 4 -#define LIBAVFILTER_VERSION_MINOR 11 -#define LIBAVFILTER_VERSION_MICRO 103 +#define LIBAVFILTER_VERSION_MAJOR 5 +#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 93ef1df6b6..c40c0c9819 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -29,9 +29,8 @@ #include "libavutil/version.h" -#define LIBAVFORMAT_VERSION_MAJOR 55 - -#define LIBAVFORMAT_VERSION_MINOR 55 +#define LIBAVFORMAT_VERSION_MAJOR 56 +#define LIBAVFORMAT_VERSION_MINOR 0 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ diff --git a/libavresample/version.h b/libavresample/version.h index 8f6ad2a79e..621d330bcd 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -27,8 +27,8 @@ #include "libavutil/version.h" -#define LIBAVRESAMPLE_VERSION_MAJOR 1 -#define LIBAVRESAMPLE_VERSION_MINOR 3 +#define LIBAVRESAMPLE_VERSION_MAJOR 2 +#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 61e4d5cc5c..a086af0520 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -55,8 +55,8 @@ * @{ */ -#define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 98 +#define LIBAVUTIL_VERSION_MAJOR 54 +#define LIBAVUTIL_VERSION_MINOR 0 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libswscale/version.h b/libswscale/version.h index 8bd29ac37a..b764883819 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -26,9 +26,9 @@ #include "libavutil/version.h" -#define LIBSWSCALE_VERSION_MAJOR 2 -#define LIBSWSCALE_VERSION_MINOR 6 -#define LIBSWSCALE_VERSION_MICRO 101 +#define LIBSWSCALE_VERSION_MAJOR 3 +#define LIBSWSCALE_VERSION_MINOR 0 +#define LIBSWSCALE_VERSION_MICRO 100 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ |