# HG changeset patch
# User compn
# Date 1217206239 0
# Node ID 7a41444980f3c8cead644cc918e16bce7a2b7224
# Parent  d9301dca97125cabef9ce34c2c58588374159b4d
add ffmotionpixels codec

diff -r d9301dca9712 -r 7a41444980f3 etc/codecs.conf
--- a/etc/codecs.conf	Sat Jul 26 22:27:50 2008 +0000
+++ b/etc/codecs.conf	Mon Jul 28 00:50:39 2008 +0000
@@ -9,6 +9,15 @@
 ;                   VIDEO CODECS
 ;=============================================================================
 
+videocodec ffmvi1
+  info "FFmpeg Motion Pixels Decoder"
+  status working
+  fourcc MVI1 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll motionpixels
+  out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+  out YV12,YUY2
+
 videocodec ffmdec
   info "FFmpeg Sony PlayStation MDEC (Motion DECoder)"
   status working
diff -r d9301dca9712 -r 7a41444980f3 libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Sat Jul 26 22:27:50 2008 +0000
+++ b/libmpdemux/mp_taglists.c	Mon Jul 28 00:50:39 2008 +0000
@@ -72,6 +72,7 @@
     { CODEC_ID_IDCIN,             MKTAG('I', 'D', 'C', 'I')},
     { CODEC_ID_INTERPLAY_VIDEO,   MKTAG('I', 'N', 'P', 'V')},
     { CODEC_ID_MDEC,              MKTAG('M', 'D', 'E', 'C')},
+    { CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
     { CODEC_ID_RL2,               MKTAG('R', 'L', '2', 'V')},
     { CODEC_ID_ROQ,               MKTAG('R', 'o', 'Q', 'V')},
     { CODEC_ID_THP,               MKTAG('T', 'H', 'P', 'V')},