added SGI image format, encoding and decoding, courtesy of Todd Kirby

<doubleshot@pacbell.net> Originally committed as revision 2876 to svn://svn.ffmpeg.org/ffmpeg/trunk
cus · Mar 13, 2004 · 6a91ec5 · 6a91ec5
1 parent 38088ad
commit 6a91ec5
Show file tree

Hide file tree

Showing 6 changed files with 480 additions and 1 deletion.
diff --git a/CREDITS b/CREDITS
@@ -15,6 +15,7 @@ Wolfgang Hesseler
 Falk Hueffner
 Zdenek Kabelac
 Robin Kay
+Todd Kirby
 Nick Kurshev
 Mike Melanson
 Michael Niedermayer

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
@@ -678,6 +678,7 @@ following image formats are supported:
 @item .Y.U.V       @tab X @tab X @tab One raw file per component
 @item Animated GIF @tab X @tab X @tab Only uncompressed GIFs are generated
 @item PNG          @tab X @tab X @tab 2 bit and 4 bit/pixel not supported yet
+@item SGI          @tab X @tab X @tab SGI RGB image format
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.

diff --git a/libavformat/Makefile b/libavformat/Makefile
@@ -34,7 +34,7 @@ OBJS+= amr.o
 endif
 
 # image formats
-OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o
+OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
 # file I/O
 OBJS+= avio.o aviobuf.o file.o 
 OBJS+= framehook.o 

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
@@ -112,6 +112,7 @@ void av_register_all(void)
 #endif
     av_register_image_format(&jpeg_image_format);
     av_register_image_format(&gif_image_format);
+    av_register_image_format(&sgi_image_format);
 #endif //CONFIG_ENCODERS
 
     /* file protocols */

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
@@ -366,6 +366,7 @@ extern AVImageFormat png_image_format;
 #endif
 extern AVImageFormat jpeg_image_format;
 extern AVImageFormat gif_image_format;
+extern AVImageFormat sgi_image_format;
 
 /* XXX: use automatic init with either ELF sections or C file parser */
 /* modules */