Add 32-bit RGB support to TIFF decoder and extend a bit 'unsupported format' message
authorKostya Shishkov <kostya.shishkov@gmail.com>
Wed, 6 May 2009 06:49:04 +0000 (06:49 +0000)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Wed, 6 May 2009 06:49:04 +0000 (06:49 +0000)
Originally committed as revision 18755 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/tiff.c

index 2768590..82327d0 100644 (file)
@@ -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){