]> git.sesse.net Git - ffmpeg/commitdiff
lavc/libx265: support all color parameters that x265 does
authorRodger Combs <rodger.combs@gmail.com>
Mon, 18 Dec 2017 12:18:57 +0000 (06:18 -0600)
committerRodger Combs <rodger.combs@gmail.com>
Sat, 13 Jan 2018 00:33:58 +0000 (18:33 -0600)
libavcodec/libx265.c

index 52ad2312a3d76cec30741a98056c4e89fc310f32..3c97800ccb5a73d58efa0d98b63be9a02d28981d 100644 (file)
@@ -115,11 +115,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
     ctx->params->sourceHeight    = avctx->height;
     ctx->params->bEnablePsnr     = !!(avctx->flags & AV_CODEC_FLAG_PSNR);
 
-    if ((avctx->color_primaries <= AVCOL_PRI_BT2020 &&
+    if ((avctx->color_primaries <= AVCOL_PRI_SMPTE432 &&
          avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) ||
-        (avctx->color_trc <= AVCOL_TRC_BT2020_12 &&
+        (avctx->color_trc <= AVCOL_TRC_ARIB_STD_B67 &&
          avctx->color_trc != AVCOL_TRC_UNSPECIFIED) ||
-        (avctx->colorspace <= AVCOL_SPC_BT2020_CL &&
+        (avctx->colorspace <= AVCOL_SPC_ICTCP &&
          avctx->colorspace != AVCOL_SPC_UNSPECIFIED)) {
 
         ctx->params->vui.bEnableVideoSignalTypePresentFlag  = 1;