Mercurial > mplayer.hg

changeset 26711:4be576db89df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add ffptx , works on ptx samples
author compn
date Mon, 12 May 2008 02:09:47 +0000
parents 605722f2c1b6
children cc07f8d00879
files etc/codecs.conf libmpdemux/demux_mf.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sun May 11 20:17:21 2008 +0000
+++ b/etc/codecs.conf	Mon May 12 02:09:47 2008 +0000
@@ -218,6 +218,14 @@
   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
--- a/libmpdemux/demux_mf.c	Sun May 11 20:17:21 2008 +0000
+++ b/libmpdemux/demux_mf.c	Mon May 12 02:09:47 2008 +0000
@@ -67,6 +67,7 @@
   { "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') },