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@videolan.org>

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index a47a7e10b7bef339e5657f72c2683bac38866365..518aa7181ef971714c898141a34f09d084a3e78c 100644 (file)
--- 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 cddc9a1fcf80bf20b4531f6446760082e5ace99f..00b82825426caa4465a14a8669b18b313777720f 100644 (file)
--- 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 3d0e8e7fa75aa314d0a4c63106bc1c9e435c940e..78c20456aac1147d21c4d2bcc68f90ec93e17581 100644 (file)
--- 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[] = {