[vlc-commits] avcodec: map Wing Commander III video

[Daniel Verkamp]

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

avcodec: map Wing Commander III video

Sample:
http://samples.mplayerhq.hu/fate-suite/wc3movie/SC_32-part.MVE

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

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

 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 94859f2..c5edd4b 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -150,6 +150,7 @@
 #define VLC_CODEC_AURA            VLC_FOURCC('A','U','R','A')
 #define VLC_CODEC_FIC             VLC_FOURCC('F','I','C','V')
 #define VLC_CODEC_TMV             VLC_FOURCC('T','M','A','V')
+#define VLC_CODEC_XAN_WC3         VLC_FOURCC('X','A','N','3')
 
 /* 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 c8e4142..01ff6bed 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -92,7 +92,7 @@ static const struct
     { VLC_CODEC_MDEC, AV_CODEC_ID_MDEC, VIDEO_ES },
     { VLC_CODEC_ROQ, AV_CODEC_ID_ROQ, VIDEO_ES },
     { VLC_CODEC_INTERPLAY, AV_CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
-    /* AV_CODEC_ID_XAN_WC3 */
+    { VLC_CODEC_XAN_WC3, AV_CODEC_ID_XAN_WC3, VIDEO_ES },
     { VLC_CODEC_XAN_WC4, AV_CODEC_ID_XAN_WC4, VIDEO_ES },
     { VLC_CODEC_RPZA, AV_CODEC_ID_RPZA, VIDEO_ES },
     { VLC_CODEC_CINEPAK, AV_CODEC_ID_CINEPAK, VIDEO_ES },
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 3576a74..ac453f6 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1059,6 +1059,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_TMV, "8088flex TMV"),
 
+    B(VLC_CODEC_XAN_WC3, "Wing Commander III video"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {