[vlc-commits] avcodec: map Electronic Arts CMV

[Daniel Verkamp]

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

avcodec: map Electronic Arts CMV

Sample:
http://fate-suite.libav.org/ea-cmv/TITLE.CMVhttp://fate-suite.libav.org/ea-cmv/TITLE.CMV

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

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

 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 a47a7e1..518aa71 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -162,6 +162,7 @@
 #define VLC_CODEC_VB              VLC_FOURCC('V','B','V','1')
 #define VLC_CODEC_RL2             VLC_FOURCC('R','L','V','2')
 #define VLC_CODEC_BFI             VLC_FOURCC('B','F','&','I')
+#define VLC_CODEC_CMV             VLC_FOURCC('E','C','M','V')
 
 /* 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 cddc9a1..00b8282 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -172,7 +172,7 @@ static const struct
     { VLC_CODEC_ESCAPE124, AV_CODEC_ID_ESCAPE124, VIDEO_ES },
     { VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC, VIDEO_ES },
     { VLC_CODEC_BFI, AV_CODEC_ID_BFI, VIDEO_ES },
-    /* AV_CODEC_ID_CMV */
+    { VLC_CODEC_CMV, AV_CODEC_ID_CMV, VIDEO_ES },
     /* AV_CODEC_ID_MOTIONPIXELS */
     /* AV_CODEC_ID_TGV */
     /* AV_CODEC_ID_TGQ */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 3d0e8e7..78c2045 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1083,6 +1083,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_BFI, "Brute Force & Ignorance (BFI) video"),
 
+    B(VLC_CODEC_CMV, "Electronic Arts CMV"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {