Commit 6a91ec51 authored by Mike Melanson's avatar Mike Melanson

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
parent 38088adf
...@@ -15,6 +15,7 @@ Wolfgang Hesseler ...@@ -15,6 +15,7 @@ Wolfgang Hesseler
Falk Hueffner Falk Hueffner
Zdenek Kabelac Zdenek Kabelac
Robin Kay Robin Kay
Todd Kirby
Nick Kurshev Nick Kurshev
Mike Melanson Mike Melanson
Michael Niedermayer Michael Niedermayer
......
...@@ -678,6 +678,7 @@ following image formats are supported: ...@@ -678,6 +678,7 @@ following image formats are supported:
@item .Y.U.V @tab X @tab X @tab One raw file per component @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 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 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 @end multitable
@code{X} means that the encoding (resp. decoding) is supported. @code{X} means that the encoding (resp. decoding) is supported.
......
...@@ -34,7 +34,7 @@ OBJS+= amr.o ...@@ -34,7 +34,7 @@ OBJS+= amr.o
endif endif
# image formats # 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 # file I/O
OBJS+= avio.o aviobuf.o file.o OBJS+= avio.o aviobuf.o file.o
OBJS+= framehook.o OBJS+= framehook.o
......
...@@ -112,6 +112,7 @@ void av_register_all(void) ...@@ -112,6 +112,7 @@ void av_register_all(void)
#endif #endif
av_register_image_format(&jpeg_image_format); av_register_image_format(&jpeg_image_format);
av_register_image_format(&gif_image_format); av_register_image_format(&gif_image_format);
av_register_image_format(&sgi_image_format);
#endif //CONFIG_ENCODERS #endif //CONFIG_ENCODERS
/* file protocols */ /* file protocols */
......
...@@ -366,6 +366,7 @@ extern AVImageFormat png_image_format; ...@@ -366,6 +366,7 @@ extern AVImageFormat png_image_format;
#endif #endif
extern AVImageFormat jpeg_image_format; extern AVImageFormat jpeg_image_format;
extern AVImageFormat gif_image_format; extern AVImageFormat gif_image_format;
extern AVImageFormat sgi_image_format;
/* XXX: use automatic init with either ELF sections or C file parser */ /* XXX: use automatic init with either ELF sections or C file parser */
/* modules */ /* modules */
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment