From 766a8346cfb4e3553be207852266058d9edb9945 Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 23 Jun 2015 14:41:26 -0700 Subject: [PATCH] libvpxdec: report colorspace Reviewed-by: Ronald S. Bultje Signed-off-by: James Zern --- libavcodec/libvpxdec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index d94561efb5..33af775a75 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -62,6 +62,13 @@ static av_cold int vpx_init(AVCodecContext *avctx, // returns 0 on success, AVERROR_INVALIDDATA otherwise static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img) { +#if VPX_IMAGE_ABI_VERSION >= 3 + static const enum AVColorSpace colorspaces[8] = { + AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_BT470BG, AVCOL_SPC_BT709, AVCOL_SPC_SMPTE170M, + AVCOL_SPC_SMPTE240M, AVCOL_SPC_BT2020_NCL, AVCOL_SPC_RESERVED, AVCOL_SPC_RGB, + }; + avctx->colorspace = colorspaces[img->cs]; +#endif if (avctx->codec_id == AV_CODEC_ID_VP8 && img->fmt != VPX_IMG_FMT_I420) return AVERROR_INVALIDDATA; switch (img->fmt) {