[SCM] libav/experimental: Add 32-bit RGB support to TIFF decoder and extend a bit 'unsupported format' message

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 512cfd9d540a592a932e26a13fc0a28421cdd621
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Wed May 6 06:49:04 2009 +0000

    Add 32-bit RGB support to TIFF decoder and extend a bit 'unsupported format' message
    
    Originally committed as revision 18755 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 2768590..82327d0 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -261,8 +261,16 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t *
                 return -1;
             }
             break;
+        case 32:
+            if(count == 4){
+                s->avctx->pix_fmt = PIX_FMT_RGBA;
+            }else{
+                av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", s->bpp, count);
+                return -1;
+            }
+            break;
         default:
-            av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%i)\n", s->bpp);
+            av_log(s->avctx, AV_LOG_ERROR, "This format is not supported (bpp=%d, %d components)\n", s->bpp, count);
             return -1;
         }
         if(s->width != s->avctx->width || s->height != s->avctx->height){

-- 
Libav/FFmpeg packaging