virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

libavcodec/libaomdec: use the matrix coefficients value from aom_image

Browse Source 
"color_space" is no longer a sytax element in libaom.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2018-03-29 00:36:51 -03:00
parent c0f0c9f531
commit 88e9b616b9
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/libaomdec.c
View File

@@ -85,16 +85,11 @@ static void image_copy_16_to_8(AVFrame *pic, struct aom_image *img)
// returns 0 on success, AVERROR_INVALIDDATA otherwise // returns 0 on success, AVERROR_INVALIDDATA otherwise
static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) 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[] = { static const enum AVColorRange color_ranges[] = {
AVCOL_RANGE_MPEG, AVCOL_RANGE_JPEG AVCOL_RANGE_MPEG, AVCOL_RANGE_JPEG
}; };
avctx->color_range = color_ranges[img->range]; avctx->color_range = color_ranges[img->range];
avctx->colorspace = colorspaces[img->cs]; avctx->colorspace = img->mc;
switch (img->fmt) { switch (img->fmt) {
case AOM_IMG_FMT_I420: case AOM_IMG_FMT_I420: