# HG changeset patch # User pross # Date 1254645743 0 # Node ID 028a4deb56d397b812a1073f29e0013d6d407dcb # Parent ada571517e88eaa49760cf0e8b3a1d52c48dc993 Sun Raster RGB support diff -r ada571517e88 -r 028a4deb56d3 sunrast.c --- a/sunrast.c Sat Oct 03 18:22:56 2009 +0000 +++ b/sunrast.c Sun Oct 04 08:42:23 2009 +0000 @@ -64,7 +64,7 @@ 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 @@ 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");