Mercurial > mplayer.hg

changeset 34304:05d2e60c728b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support FFmpeg's EA MAD decoder. Patch by Paul B. Mahol, onemda gmail
author cehoyos
date Sun, 04 Dec 2011 23:03:24 +0000
parents 99a27279dcd0
children 2fef3034c98f
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sun Dec 04 22:52:58 2011 +0000
+++ b/etc/codecs.conf	Sun Dec 04 23:03:24 2011 +0000
@@ -53,6 +53,14 @@
   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
--- a/libmpdemux/mp_taglists.c	Sun Dec 04 22:52:58 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Sun Dec 04 23:03:24 2011 +0000
@@ -125,6 +125,7 @@
     { 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')},