diff options
author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-09-12 13:33:57 +0200 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-09-12 13:33:57 +0200 |
commit | 8e082df0f436393876d3eec6d6de24263ecaa233 (patch) | |
tree | f116a588e2ea52a3916f407734d001c0fdf09e7b /libavcodec/tiff.c | |
parent | 7680d99b4302e476076cc1b8f2567f47c2aaef4d (diff) | |
download | ffmpeg-8e082df0f436393876d3eec6d6de24263ecaa233.tar.gz |
Support decoding of monochrome tiff images without bpp tag.
Diffstat (limited to 'libavcodec/tiff.c')
-rw-r--r-- | libavcodec/tiff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 078c29a541..579bd0d5f7 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; |