[vlc-commits] aom: Remove unsupported pixel formats

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Thu Apr 19 18:25:07 2018 +0300| [363c11af4120d4be9d494656938fc96130ba4731] | committer: Francois Cartegnie

aom: Remove unsupported pixel formats

Support for these was apparently never in the codebase, and the enum
values were recently removed from the public headers [1].

This fixes build with latest libaom build.

[1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12

(cherry picked from commit 622360c2c4335fff793f81f5e673326a581f5c0c)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=363c11af4120d4be9d494656938fc96130ba4731
---

 modules/codec/aom.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/codec/aom.c b/modules/codec/aom.c
index f1ae7c8304..427e7e7f5e 100644
--- a/modules/codec/aom.c
+++ b/modules/codec/aom.c
@@ -89,17 +89,6 @@ static const struct
 
     { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
     { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
-    { VLC_CODEC_YUYV, AOM_IMG_FMT_YUY2, 8, 0 },
-    { VLC_CODEC_UYVY, AOM_IMG_FMT_UYVY, 8, 0 },
-    { VLC_CODEC_YVYU, AOM_IMG_FMT_YVYU, 8, 0 },
-
-    { VLC_CODEC_RGB15, AOM_IMG_FMT_RGB555, 8, 0 },
-    { VLC_CODEC_RGB16, AOM_IMG_FMT_RGB565, 8, 0 },
-    { VLC_CODEC_RGB24, AOM_IMG_FMT_RGB24, 8, 0 },
-    { VLC_CODEC_RGB32, AOM_IMG_FMT_RGB32, 8, 0 },
-
-    { VLC_CODEC_ARGB, AOM_IMG_FMT_ARGB, 8, 0 },
-    { VLC_CODEC_BGRA, AOM_IMG_FMT_ARGB_LE, 8, 0 },
 
     { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
     { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },