Merge commit '50ea9315'

* commit '50ea9315':
  Add libx265 encoder

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

See: bb6b1731Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/libx265.c

@@ -139,7 +139,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
     if (!ctx->encoder) {
         av_log(avctx, AV_LOG_ERROR, "Cannot open libx265 encoder.\n");
         libx265_encode_close(avctx);
-        return AVERROR_EXTERNAL;
+        return AVERROR_INVALIDDATA;
     }
 
     ret = x265_encoder_headers(ctx->encoder, &nal, &nnal);

libavcodec/version.h

@@ -30,7 +30,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 55
 #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, \