Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 23:12:03 +0000 (00:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 23:15:28 +0000 (00:15 +0100)
* commit '50ea93158d4c480f64069e8bd1da388486dcf4ba':
  Add libx265 encoder

Conflicts:
Changelog
LICENSE
configure
libavcodec/allcodecs.c
libavcodec/libx265.c
libavcodec/version.h

See: bb6b1731eba2fac424ff8ad3003fe58b308debd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libx265.c
libavcodec/version.h

Simple merge
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 34
 -#define LIBAVCODEC_VERSION_MICRO  0
 +#define LIBAVCODEC_VERSION_MINOR  52
- #define LIBAVCODEC_VERSION_MICRO 100
++#define LIBAVCODEC_VERSION_MICRO 101
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \