aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2006-11-13 11:38:42 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2006-11-13 11:38:42 +0000
commit2878cecd6d5d1a4c835596bdc097706ae9206b1e (patch)
tree3a131fb81bcf3d92b09dd3dd5d1bd7b1e82ac8c9
parentb39cf84ccaa2c9d243d957f57824ac6446f315e7 (diff)
downloadffmpeg-2878cecd6d5d1a4c835596bdc097706ae9206b1e.tar.gz
Give error about planar RGB
Originally committed as revision 7011 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/tiff.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 222337d605..62e2a390b1 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -35,6 +35,7 @@ enum TiffTags{
TIFF_STRIP_OFFS = 0x111,
TIFF_ROWSPERSTRIP = 0x116,
TIFF_STRIP_SIZE,
+ TIFF_PLANAR = 0x11C,
TIFF_XPOS = 0x11E,
TIFF_YPOS = 0x11F,
TIFF_PREDICTOR = 0x13D,
@@ -415,6 +416,13 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t
j |= tget(&bp, type, s->le) >> off;
pal[i] = j;
}
+ break;
+ case TIFF_PLANAR:
+ if(value == 2){
+ av_log(s->avctx, AV_LOG_ERROR, "Planar format is not supported\n");
+ return -1;
+ }
+ break;
}
return 0;
}