Mercurial > libavcodec.hg

changeset 10358:028a4deb56d3 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sun Raster RGB support
author pross
date Sun, 04 Oct 2009 08:42:23 +0000
parents ada571517e88
children 48be79afc72d
files sunrast.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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");