[SCM] libav/experimental: Sun Raster RGB support

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 384f26f428d13f1aef26da453554401236de03c5
Author: Peter Ross <pross at xvid.org>
Date:   Sun Oct 4 08:42:23 2009 +0000

    Sun Raster RGB support
    
    Originally committed as revision 20162 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index f5f6596..e5e0f73 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");

-- 
Libav/FFmpeg packaging