From 1bbb173652605053ed9ed2fea20ee7205ea19e0e Mon Sep 17 00:00:00 2001 From: Aneesh Dogra Date: Fri, 27 Jan 2012 00:11:07 +0530 Subject: sunrast: Add a check for experimental type. Signed-off-by: Justin Ruggles --- libavcodec/sunrast.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/sunrast.c') diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 455619e..6da57d1 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -29,6 +29,7 @@ #define RT_FORMAT_RGB 3 #define RT_FORMAT_TIFF 4 #define RT_FORMAT_IFF 5 +#define RT_EXPERIMENTAL 0xffff typedef struct SUNRASTContext { AVFrame picture; @@ -70,7 +71,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, maplength = AV_RB32(buf+28); buf += 32; - if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF) { + if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF || type == RT_EXPERIMENTAL) { av_log(avctx, AV_LOG_ERROR, "unsupported (compression) type\n"); return -1; } -- cgit v1.1 From bca77a1a64a658beb616adcdd59fb3000c7a737b Mon Sep 17 00:00:00 2001 From: Aneesh Dogra Date: Fri, 27 Jan 2012 23:45:58 +0530 Subject: sunrast: Document the different Sun Raster file format types. Signed-off-by: Justin Ruggles --- libavcodec/sunrast.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'libavcodec/sunrast.c') diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 6da57d1..a471aee 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -23,12 +23,28 @@ #include "libavutil/imgutils.h" #include "avcodec.h" +/* The Old and Standard format types indicate that the image data is + * uncompressed. There is no difference between the two formats. */ #define RT_OLD 0 #define RT_STANDARD 1 + +/* The Byte-Encoded format type indicates that the image data is compressed + * using a run-length encoding scheme. */ #define RT_BYTE_ENCODED 2 + +/* The RGB format type indicates that the image is uncompressed with reverse + * component order from Old and Standard (RGB vs BGR). */ #define RT_FORMAT_RGB 3 + +/* The TIFF and IFF format types indicate that the raster file was originally + * converted from either of these file formats. We do not have any samples or + * documentation of the format details. */ #define RT_FORMAT_TIFF 4 #define RT_FORMAT_IFF 5 + +/* The Experimental format type is implementation-specific and is generally an + * indication that the image file does not conform to the Sun Raster file + * format specification. */ #define RT_EXPERIMENTAL 0xffff typedef struct SUNRASTContext { -- cgit v1.1