From bcb5c78ce3b3a3e0aa47122ea643ff5d407ac829 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Tue, 11 Aug 2009 17:56:19 +0000 Subject: [PATCH] Allow dpx image files as input. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29489 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 8 ++++++++ libmpdemux/demux_mf.c | 1 + 2 files changed, 9 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index 68bfbf3174..cdb4e5dc6c 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -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 diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index c7ac81d56f..102fbf2986 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -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') },