summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-09-12 13:33:57 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-09-12 13:33:57 +0200
commit8e082df0f436393876d3eec6d6de24263ecaa233 (patch)
treef116a588e2ea52a3916f407734d001c0fdf09e7b
parent7680d99b4302e476076cc1b8f2567f47c2aaef4d (diff)
downloadffmpeg-streaming-8e082df0f436393876d3eec6d6de24263ecaa233.zip
ffmpeg-streaming-8e082df0f436393876d3eec6d6de24263ecaa233.tar.gz
Support decoding of monochrome tiff images without bpp tag.
-rw-r--r--libavcodec/tiff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 078c29a..579bd0d 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -1008,6 +1008,8 @@ static int decode_frame(AVCodecContext *avctx,
return -1;
}
s->le = le;
+ // TIFF_BPP is not a required tag and defaults to 1
+ s->bppcount = s->bpp = 1;
s->invert = 0;
s->compr = TIFF_RAW;
s->fill_order = 0;
OpenPOWER on IntegriCloud