diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-03-08 00:25:33 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-03-08 00:25:33 +0100 |
| commit | 587226ad45948dfd360c4c2cb14341f1dfdfe351 (patch) | |
| tree | b3bf00cee37c585d2efca0298cd9e77f0fb3b4fb /libavcodec | |
| parent | 9ae3506696badc226a4e73a35009de17aeee14ce (diff) | |
| download | ffmpeg-587226ad45948dfd360c4c2cb14341f1dfdfe351.tar.gz | |
lavc/libx265: Add gray10 and gray12 encoding support.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx265.c | 5 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index f9b287eb66..784b51c52d 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -167,6 +167,8 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ctx->params->internalCsp = X265_CSP_I444; break; case AV_PIX_FMT_GRAY8: + case AV_PIX_FMT_GRAY10: + case AV_PIX_FMT_GRAY12: if (ctx->api->api_build_number < 85) { av_log(avctx, AV_LOG_ERROR, "libx265 version is %d, must be at least 85 for gray encoding.\n", @@ -350,6 +352,7 @@ static const enum AVPixelFormat x265_csp_ten[] = { AV_PIX_FMT_YUV444P10, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GRAY8, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_NONE }; @@ -367,6 +370,8 @@ static const enum AVPixelFormat x265_csp_twelve[] = { AV_PIX_FMT_YUV444P12, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GRAY8, + AV_PIX_FMT_GRAY10, + AV_PIX_FMT_GRAY12, AV_PIX_FMT_NONE }; diff --git a/libavcodec/version.h b/libavcodec/version.h index cd9ed87225..b00e011959 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 82 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |