ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Wed Mar 8 00:25:33 2017 +0100| [587226ad45948dfd360c4c2cb14341f1dfdfe351] | committer: Carl Eugen Hoyos
lavc/libx265: Add gray10 and gray12 encoding support. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=587226ad45948dfd360c4c2cb14341f1dfdfe351 --- libavcodec/libx265.c | 5 +++++ libavcodec/version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index f9b287e..784b51c 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 cd9ed87..b00e011 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, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
