diff options
| author | James Almer <jamrial@gmail.com> | 2018-04-02 16:44:18 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-04-02 17:54:36 -0300 |
| commit | 4897c80cc6eb50357503d5ced4b2443b39fa4263 (patch) | |
| tree | c7cc4f17ad27a08179c1e7133304b1e157e5ceeb /libavcodec | |
| parent | 877aff2beacbb3c238d23be9606467ca661e0609 (diff) | |
| download | ffmpeg-4897c80cc6eb50357503d5ced4b2443b39fa4263.tar.gz | |
avcodec/libaomdec: remove references to gbrp pixfmt
Support for this needs testing, so remove for now.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libaomdec.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 1352b421d9..a9fd6215fc 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -103,8 +103,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; return 0; case AOM_IMG_FMT_I444: - avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? - AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; + avctx->pix_fmt = AV_PIX_FMT_YUV444P; avctx->profile = FF_PROFILE_AV1_HIGH; return 0; case AOM_IMG_FMT_I42016: @@ -141,18 +140,15 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) } case AOM_IMG_FMT_I44416: if (img->bit_depth == 8) { - avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? - AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; + avctx->pix_fmt = AV_PIX_FMT_YUV444P; avctx->profile = FF_PROFILE_AV1_HIGH; return 0; } else if (img->bit_depth == 10) { - avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? - AV_PIX_FMT_GBRP10 : AV_PIX_FMT_YUV444P10; + avctx->pix_fmt = AV_PIX_FMT_YUV444P10; avctx->profile = FF_PROFILE_AV1_HIGH; return 0; } else if (img->bit_depth == 12) { - avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? - AV_PIX_FMT_GBRP12 : AV_PIX_FMT_YUV444P12; + avctx->pix_fmt = AV_PIX_FMT_YUV444P12; avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; return 0; } else { |