[MPlayer-cvslog] r34445 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[cehoyos]

Author: cehoyos
Date: Wed Dec 14 15:32:47 2011
New Revision: 34445

Log:
Support FFmpeg mmvideo decoder.

Patch by Paul B Mahol, onemda gmail

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Wed Dec 14 13:37:16 2011	(r34444)
+++ trunk/etc/codecs.conf	Wed Dec 14 15:32:47 2011	(r34445)
@@ -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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Wed Dec 14 13:37:16 2011	(r34444)
+++ trunk/libmpdemux/mp_taglists.c	Wed Dec 14 15:32:47 2011	(r34445)
@@ -129,6 +129,7 @@ static const struct AVCodecTag mp_bmp_ta
     { 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')},