Commit 587226ad authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/libx265: Add gray10 and gray12 encoding support.

parent 9ae35066
...@@ -167,6 +167,8 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ...@@ -167,6 +167,8 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
ctx->params->internalCsp = X265_CSP_I444; ctx->params->internalCsp = X265_CSP_I444;
break; break;
case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_GRAY8:
case AV_PIX_FMT_GRAY10:
case AV_PIX_FMT_GRAY12:
if (ctx->api->api_build_number < 85) { if (ctx->api->api_build_number < 85) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"libx265 version is %d, must be at least 85 for gray encoding.\n", "libx265 version is %d, must be at least 85 for gray encoding.\n",
...@@ -350,6 +352,7 @@ static const enum AVPixelFormat x265_csp_ten[] = { ...@@ -350,6 +352,7 @@ static const enum AVPixelFormat x265_csp_ten[] = {
AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP10,
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8,
AV_PIX_FMT_GRAY10,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
...@@ -367,6 +370,8 @@ static const enum AVPixelFormat x265_csp_twelve[] = { ...@@ -367,6 +370,8 @@ static const enum AVPixelFormat x265_csp_twelve[] = {
AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV444P12,
AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP12,
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8,
AV_PIX_FMT_GRAY10,
AV_PIX_FMT_GRAY12,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 82 #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, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment