From 4801c3c62ce4c44671ea01d4007a9641129522b7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 24 Feb 2013 17:23:38 +0100
Subject: demux_mf: add some more image formats

And fix the comment about fourccs.
---
 demux/demux_mf.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'demux')

diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 64584e820d..0d73afefc7 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -94,7 +94,7 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){
     return 1;
 }
 
-// force extension/type to have a fourcc
+// map file extension/type to a codec name
 
 static const struct {
   const char *type;
@@ -122,12 +122,26 @@ static const struct {
   { "sgi",  "sgi" },
   { "sun",  "sunrast" },
   { "ras",  "sunrast" },
+  { "rs",   "sunrast" },
   { "ra",   "sunrast" },
   { "im1",  "sunrast" },
   { "im8",  "sunrast" },
   { "im24",  "sunrast" },
+  { "im32",  "sunrast" },
   { "sunras",  "sunrast" },
   { "xbm",  "xbm" },
+  { "pam",  "pam" },
+  { "pbm",  "pbm" },
+  { "pgm",  "pgm" },
+  { "pgmyuv",  "pgmyuv" },
+  { "ppm",  "ppm" },
+  { "pnm",  "ppm" },
+  { "gif",  "gif" }, // usually handled by demux_lavf
+  { "pix",  "brender_pix" },
+  { "exr",  "exr" },
+  { "pic",  "pictor" },
+  { "xface",  "xface" },
+  { "xwd",  "xwd" },
   {0}
 };
 
-- 
cgit v1.2.3