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

[compn]

Author: compn
Date: Wed Feb 13 22:36:27 2008
New Revision: 25993

Log:
add ffpcx decoder, works on my 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	Wed Feb 13 22:36:27 2008
@@ -177,6 +177,14 @@ videocodec fftiff
   dll tiff
   out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
 
+videocodec ffpcx
+  info "FFmpeg PCX decoder"
+  status working
+  fourcc "pcx "
+  driver ffmpeg
+  dll pcx
+  out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
+
 videocodec ffpng
   info "FFmpeg PNG decoder"
   status working

Modified: trunk/libmpdemux/demux_mf.c
==============================================================================
--- trunk/libmpdemux/demux_mf.c	(original)
+++ trunk/libmpdemux/demux_mf.c	Wed Feb 13 22:36:27 2008
@@ -65,6 +65,7 @@ static const struct {
   { "bmp",  mmioFOURCC('b', 'm', 'p', ' ') },
   { "jpeg", mmioFOURCC('I', 'J', 'P', 'G') },
   { "jpg",  mmioFOURCC('I', 'J', 'P', 'G') },
+  { "pcx",  mmioFOURCC('p', 'c', 'x', ' ') },
   { "png",  mmioFOURCC('M', 'P', 'N', 'G') },
   { "tga",  mmioFOURCC('M', 'T', 'G', 'A') },
   { "tif",  mmioFOURCC('t', 'i', 'f', 'f') },