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

avcodec/libaomdec: remove references to yuv440p pixfmt

Browse Source 
While the enums are defined in the libaom headers, it's not officially
supported.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2018-03-28 21:29:15 -03:00
parent 5c75438b89
commit d039d7d4a4
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/libaomdec.c
View File

@@ -102,9 +102,6 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
case AOM_IMG_FMT_I422: case AOM_IMG_FMT_I422:
avctx->pix_fmt = AV_PIX_FMT_YUV422P; avctx->pix_fmt = AV_PIX_FMT_YUV422P;
return 0; return 0;
case AOM_IMG_FMT_I440:
avctx->pix_fmt = AV_PIX_FMT_YUV440P;
return 0;
case AOM_IMG_FMT_I444: case AOM_IMG_FMT_I444:
avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ?
AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P;
@@ -135,19 +132,6 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
} else { } else {
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
case AOM_IMG_FMT_I44016:
if (img->bit_depth == 8) {
avctx->pix_fmt = AV_PIX_FMT_YUV440P;
return 0;
} else if (img->bit_depth == 10) {
avctx->pix_fmt = AV_PIX_FMT_YUV440P10;
return 0;
} else if (img->bit_depth == 12) {
avctx->pix_fmt = AV_PIX_FMT_YUV440P12;
return 0;
} else {
return AVERROR_INVALIDDATA;
}
case AOM_IMG_FMT_I44416: case AOM_IMG_FMT_I44416:
if (img->bit_depth == 8) { if (img->bit_depth == 8) {
avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ?