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

[cehoyos]

Author: cehoyos
Date: Mon Dec  5 00:03:24 2011
New Revision: 34392

Log:
Support FFmpeg's EA MAD 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	Sun Dec  4 23:52:58 2011	(r34391)
+++ trunk/etc/codecs.conf	Mon Dec  5 00:03:24 2011	(r34392)
@@ -53,6 +53,14 @@ videocodec ffeacmv
   dll eacmv
   out BGR8
 
+videocodec ffeamad
+  info "FFmpeg EA MAD"
+  status working
+  fourcc MADk ; internal MPlayer FourCC
+  driver ffmpeg
+  dll eamad
+  out YV12
+
 videocodec ffmvi1
   info "FFmpeg Motion Pixels"
   status working

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Sun Dec  4 23:52:58 2011	(r34391)
+++ trunk/libmpdemux/mp_taglists.c	Mon Dec  5 00:03:24 2011	(r34392)
@@ -125,6 +125,7 @@ static const struct AVCodecTag mp_bmp_ta
     { CODEC_ID_IDCIN,             MKTAG('I', 'D', 'C', 'I')},
     { CODEC_ID_INTERPLAY_VIDEO,   MKTAG('I', 'N', 'P', 'V')},
     { 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_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
     { CODEC_ID_MXPEG,             MKTAG('M', 'X', 'P', 'G')},