diff options
| author | James Almer <jamrial@gmail.com> | 2018-03-29 00:36:51 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-03-29 00:37:00 -0300 |
| commit | 88e9b616b94a6d0aea020ea63a36e222e4e7ee18 (patch) | |
| tree | 51c698aafe592991c7bf9da742b7b91fcb232328 | |
| parent | c0f0c9f5318786904bc87f9278868ff3c3a7802d (diff) | |
| download | ffmpeg-88e9b616b94a6d0aea020ea63a36e222e4e7ee18.tar.gz | |
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 <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/libaomdec.c | 7 |
1 files changed, 1 insertions, 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: |