]> git.sesse.net Git - vlc/commitdiff
avcodec: map Motion Pixels
authorDaniel Verkamp <daniel@drv.nu>
Fri, 20 Jun 2014 06:25:16 +0000 (23:25 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 20 Jun 2014 14:24:27 +0000 (16:24 +0200)
Sample:
http://fate-suite.libav.org/motion-pixels/INTRO-partial.MVI

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
include/vlc_fourcc.h
modules/codec/avcodec/fourcc.c
src/misc/fourcc.c

index 518aa7181ef971714c898141a34f09d084a3e78c..f90bbc311d7ca989382d45ee0f0dad5f5f3776c6 100644 (file)
 #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')
index 00b82825426caa4465a14a8669b18b313777720f..12402666290ccb2a9ff225b40aa2b826abebeace 100644 (file)
@@ -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 */
index 78c20456aac1147d21c4d2bcc68f90ec93e17581..7d08a8fee907f0ce46aed5924360fe1957233c50 100644 (file)
@@ -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[] = {