ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Mar 29 00:36:51 2018 -0300| [88e9b616b94a6d0aea020ea63a36e222e4e7ee18] | committer: James Almer
libavcodec/libaomdec: use the matrix coefficients value from aom_image "color_space" is no longer a sytax element in libaom. Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88e9b616b94a6d0aea020ea63a36e222e4e7ee18 --- libavcodec/libaomdec.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 05e476c342..1d077e035e 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -85,16 +85,11 @@ static void image_copy_16_to_8(AVFrame *pic, struct aom_image *img) // returns 0 on success, AVERROR_INVALIDDATA otherwise static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) { - static const enum AVColorSpace colorspaces[10] = { - AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_BT470BG, AVCOL_SPC_BT709, AVCOL_SPC_SMPTE170M, - AVCOL_SPC_SMPTE240M, AVCOL_SPC_BT2020_NCL, AVCOL_SPC_BT2020_CL, AVCOL_SPC_RGB, - AVCOL_SPC_ICTCP, AVCOL_SPC_RESERVED - }; static const enum AVColorRange color_ranges[] = { AVCOL_RANGE_MPEG, AVCOL_RANGE_JPEG }; avctx->color_range = color_ranges[img->range]; - avctx->colorspace = colorspaces[img->cs]; + avctx->colorspace = img->mc; switch (img->fmt) { case AOM_IMG_FMT_I420: _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
