From ef06ed5b185dc619d9bf94d3d1284b410e25ea6b Mon Sep 17 00:00:00 2001 From: James Almer Date: Sun, 1 Apr 2018 22:50:34 -0300 Subject: libaom: remove references to yuv440p pixfmt Support for it was apparently never in the codebase, and the enum values were recently removed from the public headers [1] Fixes build with latest libaom build. [1] https://aomedia.googlesource.com/aom/+/2e3cd5c5c30fa02134681cda900c32486807af3f Signed-off-by: James Almer --- libavcodec/libaom.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/libaom.c b/libavcodec/libaom.c index 220b1bd..f083129 100644 --- a/libavcodec/libaom.c +++ b/libavcodec/libaom.c @@ -68,8 +68,6 @@ enum AVPixelFormat ff_aom_imgfmt_to_pixfmt(aom_img_fmt_t img, int depth) return AV_PIX_FMT_YUV444P; case AOM_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P; - case AOM_IMG_FMT_I440: - return AV_PIX_FMT_YUV440P; HIGH_DEPTH(420) HIGH_DEPTH(422) HIGH_DEPTH(444) @@ -113,8 +111,6 @@ aom_img_fmt_t ff_aom_pixfmt_to_imgfmt(enum AVPixelFormat pix) return AOM_IMG_FMT_I444; case AV_PIX_FMT_YUVA444P: return AOM_IMG_FMT_444A; - case AV_PIX_FMT_YUV440P: - return AOM_IMG_FMT_I440; case AV_PIX_FMT_YUV420P10: return AOM_IMG_FMT_I42016; case AV_PIX_FMT_YUV422P10: -- cgit v1.1 From b0958698ea2b976063cb1d683becc213040c709b Mon Sep 17 00:00:00 2001 From: James Almer Date: Wed, 4 Apr 2018 20:12:41 -0300 Subject: libaom: remove references to RGB pixfmts Support for it was apparently never in the codebase, and the enum values were recently removed from the public headers [1] Fixes build with latest libaom build. [1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12 Signed-off-by: James Almer --- libavcodec/libaom.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/libavcodec/libaom.c b/libavcodec/libaom.c index f083129..512095b 100644 --- a/libavcodec/libaom.c +++ b/libavcodec/libaom.c @@ -38,28 +38,6 @@ case AOM_IMG_FMT_I ## fmt ## 16: \ enum AVPixelFormat ff_aom_imgfmt_to_pixfmt(aom_img_fmt_t img, int depth) { switch (img) { - case AOM_IMG_FMT_RGB24: - return AV_PIX_FMT_RGB24; - case AOM_IMG_FMT_RGB565: - return AV_PIX_FMT_RGB565BE; - case AOM_IMG_FMT_RGB555: - return AV_PIX_FMT_RGB555BE; - case AOM_IMG_FMT_UYVY: - return AV_PIX_FMT_UYVY422; - case AOM_IMG_FMT_YUY2: - return AV_PIX_FMT_YUYV422; - case AOM_IMG_FMT_YVYU: - return AV_PIX_FMT_YVYU422; - case AOM_IMG_FMT_BGR24: - return AV_PIX_FMT_BGR24; - case AOM_IMG_FMT_ARGB: - return AV_PIX_FMT_ARGB; - case AOM_IMG_FMT_ARGB_LE: - return AV_PIX_FMT_BGRA; - case AOM_IMG_FMT_RGB565_LE: - return AV_PIX_FMT_RGB565LE; - case AOM_IMG_FMT_RGB555_LE: - return AV_PIX_FMT_RGB555LE; case AOM_IMG_FMT_I420: return AV_PIX_FMT_YUV420P; case AOM_IMG_FMT_I422: @@ -81,28 +59,6 @@ enum AVPixelFormat ff_aom_imgfmt_to_pixfmt(aom_img_fmt_t img, int depth) aom_img_fmt_t ff_aom_pixfmt_to_imgfmt(enum AVPixelFormat pix) { switch (pix) { - case AV_PIX_FMT_RGB24: - return AOM_IMG_FMT_RGB24; - case AV_PIX_FMT_RGB565BE: - return AOM_IMG_FMT_RGB565; - case AV_PIX_FMT_RGB555BE: - return AOM_IMG_FMT_RGB555; - case AV_PIX_FMT_UYVY422: - return AOM_IMG_FMT_UYVY; - case AV_PIX_FMT_YUYV422: - return AOM_IMG_FMT_YUY2; - case AV_PIX_FMT_YVYU422: - return AOM_IMG_FMT_YVYU; - case AV_PIX_FMT_BGR24: - return AOM_IMG_FMT_BGR24; - case AV_PIX_FMT_ARGB: - return AOM_IMG_FMT_ARGB; - case AV_PIX_FMT_BGRA: - return AOM_IMG_FMT_ARGB_LE; - case AV_PIX_FMT_RGB565LE: - return AOM_IMG_FMT_RGB565_LE; - case AV_PIX_FMT_RGB555LE: - return AOM_IMG_FMT_RGB555_LE; case AV_PIX_FMT_YUV420P: return AOM_IMG_FMT_I420; case AV_PIX_FMT_YUV422P: -- cgit v1.1