Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 22:26:45 +0000 (00:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 22:26:45 +0000 (00:26 +0200)
* 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>
1  2 
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavresample/version.h
libavutil/version.h
libswscale/version.h

diff --cc doc/APIchanges
index 024ba3a4a8c9208e423a8bbd7e494632025b3db2,250088b24fd6597bcd3a2b50b53cbfe077d06cef..4030428e0e836d01812c4f4d673845398940636b
@@@ -1,16 -1,14 +1,16 @@@
  Never assume the API of libav* to be stable unless at least 1 month has passed
 -since the last major version increase.
 +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:
index 503fddcc6ab9f024b8919d9b90e271a7db0f842a,f7bb8e00b258b319cb5ceb3a937e0c65af430297..ffecae03e88df62539df841d8a5113fd52cb048a
@@@ -28,9 -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  0
++#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \
index a098549593c165a79ab31688238159a4759b0ae2,3d82c97d2e469149eafdf66c3a2029b6c08c3690..4529c641eba6caa6d682b855dea3b9d9a5972e61
@@@ -27,9 -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 55
++#define LIBAVDEVICE_VERSION_MAJOR 56
+ #define LIBAVDEVICE_VERSION_MINOR  0
 -#define LIBAVDEVICE_VERSION_MICRO  0
++#define LIBAVDEVICE_VERSION_MICRO 100
  
  #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
                                                 LIBAVDEVICE_VERSION_MINOR, \
index 632e90448d9c04517190ba1137ef66de0db6b331,70b08e5215d21509fba7b4633a6d3a65d4b4ca9e..2003b76ba1c6bb5564e60d0ed6a6bcddf5a3d4c7
@@@ -29,9 -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  0
++#define LIBAVFILTER_VERSION_MICRO 100
  
  #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                 LIBAVFILTER_VERSION_MINOR, \
index 93ef1df6b6dac0e171faa8c7a4d5f89301563542,89f4ba10e343ec802183509a37264190e1937100..c40c0c9819b72d3391907023444463a4c61bab94
  
  #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  0
 +#define LIBAVFORMAT_VERSION_MICRO 100
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \
Simple merge
index 61e4d5cc5cb9e2f8be2ff2c3ae51ad90a0c5dfd2,3d4e036b582d66c4ee8d40856b1a3cb3ad056554..a086af05209fa47284ee1664773dbdcee3f46abf
@@@ -55,9 -53,9 +55,9 @@@
   * @{
   */
  
- #define LIBAVUTIL_VERSION_MAJOR  52
- #define LIBAVUTIL_VERSION_MINOR  98
 -#define LIBAVUTIL_VERSION_MAJOR 54
 -#define LIBAVUTIL_VERSION_MINOR  0
 -#define LIBAVUTIL_VERSION_MICRO  0
++#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, \
                                                 LIBAVUTIL_VERSION_MINOR, \
index 8bd29ac37adc2285190e3da9b14cf94703051343,fdde657168d55dc6f9634e88242e1830e2dabef4..b76488381911deea4675935a69be31e6074ce976
@@@ -26,9 -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 0
++#define LIBSWSCALE_VERSION_MICRO 100
  
  #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
                                                 LIBSWSCALE_VERSION_MINOR, \