# HG changeset patch
# User cehoyos
# Date 1323873167 0
# Node ID dd20c9da30514dffe1ba3b7b90a21641bbfe1422
# Parent  9ae4b7f8b1e22d1c885a694f0afb6d04607b348f
Support FFmpeg mmvideo decoder.

Patch by Paul B Mahol, onemda gmail

diff -r 9ae4b7f8b1e2 -r dd20c9da3051 etc/codecs.conf
--- a/etc/codecs.conf	Wed Dec 14 12:37:16 2011 +0000
+++ b/etc/codecs.conf	Wed Dec 14 14:32:47 2011 +0000
@@ -78,6 +78,14 @@
   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 -r 9ae4b7f8b1e2 -r dd20c9da3051 libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Wed Dec 14 12:37:16 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Wed Dec 14 14:32:47 2011 +0000
@@ -129,6 +129,7 @@
     { 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')},