diff options
| author | Peter Ross <pross@xvid.org> | 2009-10-04 08:42:23 +0000 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2009-10-04 08:42:23 +0000 |
| commit | 384f26f428d13f1aef26da453554401236de03c5 (patch) | |
| tree | 3ec8db8bd74af89e8f25ec85657cac3d02e92a63 /libavcodec/sunrast.c | |
| parent | e18027ac4042fa375357bcf063e6b0d9dbe0f7b9 (diff) | |
| download | ffmpeg-384f26f428d13f1aef26da453554401236de03c5.tar.gz | |
Sun Raster RGB support
Originally committed as revision 20162 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/sunrast.c')
| -rw-r--r-- | libavcodec/sunrast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index f5f659604c..e5e0f73cb8 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -64,7 +64,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, maptype = AV_RB32(buf+24); maplength = AV_RB32(buf+28); - if (type > RT_BYTE_ENCODED && type <= RT_FORMAT_IFF) { + if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF) { av_log(avctx, AV_LOG_ERROR, "unsupported (compression) type\n"); return -1; } @@ -87,7 +87,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, avctx->pix_fmt = PIX_FMT_PAL8; break; case 24: - avctx->pix_fmt = PIX_FMT_BGR24; + avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_BGR24; break; default: av_log(avctx, AV_LOG_ERROR, "invalid depth\n"); |