[FFmpeg-cvslog] avcodec/libaomdec: remove references to gbrp pixfmt
James Almer
git at videolan.org
Tue Apr 3 00:27:27 EEST 2018
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Apr 2 16:44:18 2018 -0300| [4897c80cc6eb50357503d5ced4b2443b39fa4263] | committer: James Almer
avcodec/libaomdec: remove references to gbrp pixfmt
Support for this needs testing, so remove for now.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4897c80cc6eb50357503d5ced4b2443b39fa4263
---
libavcodec/libaomdec.c | 12 ++++--------
1 file 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 {
More information about the ffmpeg-cvslog
mailing list