[MPlayer-dev-eng] [PATCH] Support for FFmpeg mmvideo decoder.

[Paul B Mahol]

---
 etc/codecs.conf          |    8 ++++++++
 libmpdemux/mp_taglists.c |    1 +
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 01ea6bb..4109a15 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -78,6 +78,14 @@ videocodec ffmdec
   dll mdec
   out YV12
 
+videocodec ffmmvideo
+  info "FFmpeg American Laser Games MM Video"
+  status working
+  fourcc "MMV " ; internal MPlayer FourCC
+  driver ffmpeg
+  dll mmvideo
+  out BGR8
+
 videocodec ffsiff
   info "FFmpeg Beam Software SIFF"
   status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 1be1a3d..68b4abe 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -129,6 +129,7 @@ static const struct AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_JV,                MKTAG('F', 'F', 'J', 'V')},
     { CODEC_ID_MAD,               MKTAG('M', 'A', 'D', 'k')},
     { CODEC_ID_MDEC,              MKTAG('M', 'D', 'E', 'C')},
+    { CODEC_ID_MMVIDEO,           MKTAG('M', 'M', 'V', ' ')},
     { CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
     { CODEC_ID_MXPEG,             MKTAG('M', 'X', 'P', 'G')},
     { CODEC_ID_NUV,               MKTAG('N', 'U', 'V', '1')},
-- 
1.7.7