[vlc-commits] avcodec: map American Laser Games MM Video

[Daniel Verkamp]

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

avcodec: map American Laser Games MM Video

Sample:
http://fate-suite.libav.org/alg-mm/ibmlogo.mm

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

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

 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 b42addb..a470d99 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -152,6 +152,7 @@
 #define VLC_CODEC_TMV             VLC_FOURCC('T','M','A','V')
 #define VLC_CODEC_XAN_WC3         VLC_FOURCC('X','A','N','3')
 #define VLC_CODEC_WS_VQA          VLC_FOURCC('W','V','Q','A')
+#define VLC_CODEC_MMVIDEO         VLC_FOURCC('M','M','V','I')
 
 /* 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 4f7e900..f91bd02 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -134,7 +134,7 @@ static const struct
     { VLC_CODEC_TRUEMOTION2, AV_CODEC_ID_TRUEMOTION2, VIDEO_ES },
     { VLC_CODEC_BMP, AV_CODEC_ID_BMP, VIDEO_ES },
     { VLC_CODEC_CSCD, AV_CODEC_ID_CSCD, VIDEO_ES },
-    /* AV_CODEC_ID_MMVIDEO */
+    { VLC_CODEC_MMVIDEO, AV_CODEC_ID_MMVIDEO, VIDEO_ES },
     { VLC_CODEC_ZMBV, AV_CODEC_ID_ZMBV, VIDEO_ES },
     /* AV_CODEC_ID_AVS */
     { VLC_CODEC_SMACKVIDEO, AV_CODEC_ID_SMACKVIDEO, VIDEO_ES },
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 1ee976c..04820c1 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1063,6 +1063,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_WS_VQA, "Westwood Studios VQA"),
 
+    B(VLC_CODEC_MMVIDEO, "American Laser Games MM Video"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {