diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-03-13 09:40:09 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-03-13 09:40:09 +0100 |
| commit | d11d78facb1b24a0dc6ea63c2410d62c1f92742e (patch) | |
| tree | 9365821388c445791c27227fd2f40babf1778310 | |
| parent | db4786f1cf03a5ce4841412e5dad03404e5ade7a (diff) | |
| download | ffmpeg-d11d78facb1b24a0dc6ea63c2410d62c1f92742e.tar.gz | |
lavc/libx265: Support GBR encoding.
| -rw-r--r-- | libavcodec/libx265.c | 12 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 68c7fba3cc..11088b2205 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -154,6 +154,12 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) case AV_PIX_FMT_YUV422P12: ctx->params->internalCsp = X265_CSP_I422; break; + case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_GBRP10: + case AV_PIX_FMT_GBRP12: + ctx->params->vui.matrixCoeffs = AVCOL_SPC_RGB; + ctx->params->vui.bEnableVideoSignalTypePresentFlag = 1; + ctx->params->vui.bEnableColorDescriptionPresentFlag = 1; case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_YUV444P10: case AV_PIX_FMT_YUV444P12: @@ -318,6 +324,7 @@ static const enum AVPixelFormat x265_csp_eight[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, + AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE }; @@ -325,9 +332,11 @@ static const enum AVPixelFormat x265_csp_ten[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, + AV_PIX_FMT_GBRP, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE }; @@ -335,12 +344,15 @@ static const enum AVPixelFormat x265_csp_twelve[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, + AV_PIX_FMT_GBRP, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_GBRP10, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, + AV_PIX_FMT_GBRP12, AV_PIX_FMT_NONE }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 1306bc3352..6e42810765 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 28 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |