Mercurial > mplayer.hg

changeset 29447:db248c87f4cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow dpx image files as input.
author cehoyos
date Tue, 11 Aug 2009 17:56:19 +0000
parents da2641b029b1
children 80c6dd85f7f8
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	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
--- 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') },