[vlc-commits] avcodec: map Motion Pixels

[Daniel Verkamp]

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

avcodec: map Motion Pixels

Sample:
http://fate-suite.libav.org/motion-pixels/INTRO-partial.MVI

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

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

 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 518aa71..f90bbc3 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -163,6 +163,7 @@
 #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')
+#define VLC_CODEC_MOTIONPIXELS    VLC_FOURCC('M','P','I','X')
 
 /* 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 00b8282..1240266 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -173,7 +173,7 @@ static const struct
     { VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC, VIDEO_ES },
     { VLC_CODEC_BFI, AV_CODEC_ID_BFI, VIDEO_ES },
     { VLC_CODEC_CMV, AV_CODEC_ID_CMV, VIDEO_ES },
-    /* AV_CODEC_ID_MOTIONPIXELS */
+    { VLC_CODEC_MOTIONPIXELS, AV_CODEC_ID_MOTIONPIXELS, VIDEO_ES },
     /* AV_CODEC_ID_TGV */
     /* AV_CODEC_ID_TGQ */
     /* AV_CODEC_ID_TQI */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 78c2045..7d08a8f 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1085,6 +1085,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_CMV, "Electronic Arts CMV"),
 
+    B(VLC_CODEC_MOTIONPIXELS, "Sirius Publishing Motion Pixels"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {