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

[cehoyos]

Author: cehoyos
Date: Tue Aug 11 19:56:19 2009
New Revision: 29489

Log:
Allow dpx image files as input.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Tue Aug 11 19:54:11 2009	(r29488)
+++ trunk/etc/codecs.conf	Tue Aug 11 19:56:19 2009	(r29489)
@@ -338,6 +338,14 @@ videocodec ffbmp
   dll bmp
   out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8
 
+videocodec ffdpx
+  info "FFmpeg DPX"
+  status working
+  fourcc "dpx " ; "dpx " is an internal MPlayer FOURCC
+  driver ffmpeg
+  dll dpx
+  out RG48BE,RG48LE
+
 videocodec ffgif
   info "FFmpeg GIF"
   status working

Modified: trunk/libmpdemux/demux_mf.c
==============================================================================
--- trunk/libmpdemux/demux_mf.c	Tue Aug 11 19:54:11 2009	(r29488)
+++ trunk/libmpdemux/demux_mf.c	Tue Aug 11 19:56:19 2009	(r29489)
@@ -82,6 +82,7 @@ static const struct {
   uint32_t format;
 } type2format[] = {
   { "bmp",  mmioFOURCC('b', 'm', 'p', ' ') },
+  { "dpx",  mmioFOURCC('d', 'p', 'x', ' ') },
   { "jpeg", mmioFOURCC('I', 'J', 'P', 'G') },
   { "jpg",  mmioFOURCC('I', 'J', 'P', 'G') },
   { "jls",  mmioFOURCC('I', 'J', 'P', 'G') },