[MPlayer-cvslog] r26743 - in trunk: etc/codecs.conf libmpdemux/demux_mf.c

[compn]

Author: compn
Date: Mon May 12 04:09:47 2008
New Revision: 26743

Log:
add ffptx , works on ptx samples

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Mon May 12 04:09:47 2008
@@ -218,6 +218,14 @@ videocodec mpng
   driver mpng
   out BGR32,BGR24,BGR8,Y800
 
+videocodec ffptx
+  info "FFmpeg V.Flash PTX decoder"
+  status working
+  fourcc "ptx "
+  driver ffmpeg
+  dll ptx
+  out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+
 videocodec fftga
   info "FFmpeg TGA decoder"
   status untested

Modified: trunk/libmpdemux/demux_mf.c
==============================================================================
--- trunk/libmpdemux/demux_mf.c	(original)
+++ trunk/libmpdemux/demux_mf.c	Mon May 12 04:09:47 2008
@@ -67,6 +67,7 @@ static const struct {
   { "jpg",  mmioFOURCC('I', 'J', 'P', 'G') },
   { "pcx",  mmioFOURCC('p', 'c', 'x', ' ') },
   { "png",  mmioFOURCC('M', 'P', 'N', 'G') },
+  { "ptx",  mmioFOURCC('p', 't', 'x', ' ') },
   { "tga",  mmioFOURCC('M', 'T', 'G', 'A') },
   { "tif",  mmioFOURCC('t', 'i', 'f', 'f') },
   { "sgi",  mmioFOURCC('S', 'G', 'I', '1') },