# HG changeset patch
# User cehoyos
# Date 1250013379 0
# Node ID db248c87f4cf9274118ae9a6d957f79772c99dcc
# Parent  da2641b029b18588db939f03571b283d9e7899c5
Allow dpx image files as input.

diff -r da2641b029b1 -r db248c87f4cf etc/codecs.conf
--- a/etc/codecs.conf	Tue Aug 11 17:54:11 2009 +0000
+++ b/etc/codecs.conf	Tue Aug 11 17:56:19 2009 +0000
@@ -338,6 +338,14 @@
   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
diff -r da2641b029b1 -r db248c87f4cf libmpdemux/demux_mf.c
--- a/libmpdemux/demux_mf.c	Tue Aug 11 17:54:11 2009 +0000
+++ b/libmpdemux/demux_mf.c	Tue Aug 11 17:56:19 2009 +0000
@@ -82,6 +82,7 @@
   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') },