summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf8
-rw-r--r--libmpdemux/demux_mf.c1
2 files changed, 9 insertions, 0 deletions
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') },