diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-05-06 06:49:04 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-05-06 06:49:04 +0000 |
| commit | 512cfd9d540a592a932e26a13fc0a28421cdd621 (patch) | |
| tree | 0fa2d5dd5be6626981c96777477346a0054d4dbf /libavcodec/tiff.c | |
| parent | 992f7db060736591b76656b55bf2bf6f8ea14be4 (diff) | |
| download | ffmpeg-512cfd9d540a592a932e26a13fc0a28421cdd621.tar.gz | |
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
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 2768590423..82327d0838 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){ |