From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 12 Feb 2014 23:12:03 +0000 (+0100)
Subject: Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'
X-Git-Tag: n2.2-rc1~304
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/86316039ab06bcf5c8b9c14f535f1dd072990e3b

Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'

* 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>
---

86316039ab06bcf5c8b9c14f535f1dd072990e3b
diff --cc libavcodec/version.h
index 20607937a1,425307436e..f805a64bf2
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -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, \