diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 00:12:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 00:15:28 +0100 |
| commit | 86316039ab06bcf5c8b9c14f535f1dd072990e3b (patch) | |
| tree | 932ffc4715b5fcbefd99e60dceaef84f9bad00d4 | |
| parent | c3204856331b9c34bf7c4fd83527c5065e4cdd7e (diff) | |
| parent | 50ea93158d4c480f64069e8bd1da388486dcf4ba (diff) | |
| download | ffmpeg-86316039ab06bcf5c8b9c14f535f1dd072990e3b.tar.gz | |
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>
| -rw-r--r-- | libavcodec/libx265.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index d51a98ca41..d37fa1554c 100644 --- a/libavcodec/libx265.c +++ b/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); diff --git a/libavcodec/version.h b/libavcodec/version.h index 20607937a1..f805a64bf2 100644 --- a/libavcodec/version.h +++ b/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, \ |