Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 18:52:40 +0000 (20:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 18:52:40 +0000 (20:52 +0200)
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
  swscale: Undeprecate sws_getContext()

Conflicts:
libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
libswscale/swscale.h
libswscale/utils.c
libswscale/version.h

diff --cc doc/APIchanges
Simple merge
Simple merge
Simple merge
@@@ -27,8 -27,8 +27,8 @@@
  #include "libavutil/version.h"
  
  #define LIBSWSCALE_VERSION_MAJOR 2
 -#define LIBSWSCALE_VERSION_MINOR 1
 -#define LIBSWSCALE_VERSION_MICRO 3
 +#define LIBSWSCALE_VERSION_MINOR 6
- #define LIBSWSCALE_VERSION_MICRO 100
++#define LIBSWSCALE_VERSION_MICRO 101
  
  #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
                                                 LIBSWSCALE_VERSION_MINOR, \