Mercurial > mplayer.hg

changeset 34062:4a0cac2ced3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
decoder: add ffmpeg ansi decoder
author compn
date Thu, 29 Sep 2011 02:44:48 +0000
parents fe03e0d5c7d0
children 31fdbcd6de70
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	Wed Sep 28 18:52:11 2011 +0000
+++ b/etc/codecs.conf	Thu Sep 29 02:44:48 2011 +0000
@@ -17,6 +17,14 @@
   dll anm
   out BGR8
 
+videocodec ffansi
+  info "FFmpeg ASCII/ANSI art"
+  status working
+  fourcc TXT4 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll ansi
+  out BGR8
+
 videocodec ffbinkvideo
   info "FFmpeg Bink Video"
   status working
--- a/libmpdemux/mp_taglists.c	Wed Sep 28 18:52:11 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Thu Sep 29 02:44:48 2011 +0000
@@ -94,6 +94,7 @@
 static const AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_AMV,               MKTAG('A', 'M', 'V', 'V')},
     { CODEC_ID_ANM,               MKTAG('A', 'N', 'M', ' ')},
+    { CODEC_ID_ANSI,              MKTAG('T', 'X', 'T', '4')},
     { CODEC_ID_AVS,               MKTAG('A', 'V', 'S', ' ')},
     { CODEC_ID_BETHSOFTVID,       MKTAG('B', 'E', 'T', 'H')},
     { CODEC_ID_BFI,               MKTAG('B', 'F', 'I', 'V')},