]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/libaomdec: remove references to gbrp pixfmt
authorJames Almer <jamrial@gmail.com>
Mon, 2 Apr 2018 19:44:18 +0000 (16:44 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 2 Apr 2018 20:54:36 +0000 (17:54 -0300)
Support for this needs testing, so remove for now.

Signed-off-by: James Almer <jamrial@gmail.com>
libavcodec/libaomdec.c

index 1352b421d9c2653fc38dd49439700598d340200c..a9fd6215fcb9b9ccf170bb523b9091acf1e64afe 100644 (file)
@@ -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 {