[vlc-commits] avcodec: map Feeble Files/ScummVM DXA

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Thu Jun 19 23:25:09 2014 -0700| [885bb88cca8599398ef5bb9948e490daf5ae463e] | committer: Jean-Baptiste Kempf

avcodec: map Feeble Files/ScummVM DXA

Sample:
http://fate-suite.libav.org/dxa/meetsquid.dxa

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=885bb88cca8599398ef5bb9948e490daf5ae463e
---

 include/vlc_fourcc.h           |    1 +
 modules/codec/avcodec/fourcc.c |    2 +-
 src/misc/fourcc.c              |    2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 06ac4d0..e4394da 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -156,6 +156,7 @@
 #define VLC_CODEC_AVS             VLC_FOURCC('A','V','S','V')
 #define VLC_CODEC_DSICINVIDEO     VLC_FOURCC('D','C','I','V')
 #define VLC_CODEC_TIERTEXSEQVIDEO VLC_FOURCC('T','S','E','Q')
+#define VLC_CODEC_DXA             VLC_FOURCC('D','E','X','A')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 50f6fa9..e626aa6 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -152,7 +152,7 @@ static const struct
     { VLC_CODEC_TIERTEXSEQVIDEO, AV_CODEC_ID_TIERTEXSEQVIDEO, VIDEO_ES },
     { VLC_CODEC_TIFF, AV_CODEC_ID_TIFF, VIDEO_ES },
     { VLC_CODEC_GIF, AV_CODEC_ID_GIF, VIDEO_ES },
-    /* AV_CODEC_ID_DXA */
+    { VLC_CODEC_DXA, AV_CODEC_ID_DXA, VIDEO_ES },
     { VLC_CODEC_DNXHD, AV_CODEC_ID_DNXHD, VIDEO_ES },
     { VLC_CODEC_THP, AV_CODEC_ID_THP, VIDEO_ES },
     { VLC_CODEC_SGI, AV_CODEC_ID_SGI, VIDEO_ES },
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index c1aa698..df2bbec 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1071,6 +1071,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_TIERTEXSEQVIDEO, "Tiertex Limited SEQ video"),
 
+    B(VLC_CODEC_DXA, "Feeble Files/ScummVM DXA"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {