diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-01-10 18:45:44 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-01-11 11:15:05 +0100 |
| commit | 98dfdfdd8e5e94d7a2cdf9ac0b4ef8c622afe4e9 (patch) | |
| tree | 80904934190da32e34664442d7016e1601567fb6 | |
| parent | c3ff0713ef7c27da02226efa61f4dd9015ebf22d (diff) | |
| download | ffmpeg-98dfdfdd8e5e94d7a2cdf9ac0b4ef8c622afe4e9.tar.gz | |
tiffdec: notify user that tile support is missing
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
| -rw-r--r-- | libavcodec/tiff.c | 7 | ||||
| -rw-r--r-- | libavcodec/tiff.h | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index b0ccbace15..67aeb2398f 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -485,6 +485,13 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t * return -1; } break; + case TIFF_TILE_BYTE_COUNTS: + case TIFF_TILE_LENGTH: + case TIFF_TILE_OFFSETS: + case TIFF_TILE_WIDTH: + av_log(s->avctx, AV_LOG_ERROR, "Tiled images are not supported\n"); + return AVERROR_PATCHWELCOME; + break; case TIFF_PREDICTOR: s->predictor = value; break; diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index d5fad42771..42cfb18861 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -56,6 +56,10 @@ enum TiffTags{ TIFF_SOFTWARE_NAME = 0x131, TIFF_PREDICTOR = 0x13D, TIFF_PAL = 0x140, + TIFF_TILE_WIDTH = 0x142, + TIFF_TILE_LENGTH = 0x143, + TIFF_TILE_OFFSETS = 0x144, + TIFF_TILE_BYTE_COUNTS = 0x145, TIFF_YCBCR_COEFFICIENTS = 0x211, TIFF_YCBCR_SUBSAMPLING = 0x212, TIFF_YCBCR_POSITIONING = 0x213, |