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>
libavcodec/libx265.c
libavcodec/version.h

index d51a98c..d37fa15 100644 (file)
@@ -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);
index 2060793..f805a64 100644 (file)
@@ -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, \