Add 32-bit RGB support to TIFF decoder and extend a bit 'unsupported format' message

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18755 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 2768590423fa13c8f479f101d5f9b41f72ec386e..82327d0838590eb433ae612409c5ec327e0c1f81 100644 (file)
--- 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){