aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/tiff.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-04-27 21:49:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-27 21:49:45 +0200
commitdbfdb288c1921eeb9fef5bca20eee33da7fcdd71 (patch)
treec0b99795fee3fa4a48c8ed4af6a165bc58f5b261 /libavcodec/tiff.c
parente91946ed23dfbb9a6341266020ed8475ec15697d (diff)
downloadffmpeg-dbfdb288c1921eeb9fef5bca20eee33da7fcdd71.tar.gz
Set alpha of palettes to 0xff.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff.c')
-rw-r--r--libavcodec/tiff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 8295a4b4c0..d43999b2f0 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -429,7 +429,8 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t *
bp = buf + count / 3 * off * 2;
off = (type_sizes[type] - 1) << 3;
for(i = 0; i < count / 3; i++){
- j = (tget(&rp, type, s->le) >> off) << 16;
+ j = 0xff << 24;
+ j |= (tget(&rp, type, s->le) >> off) << 16;
j |= (tget(&gp, type, s->le) >> off) << 8;
j |= tget(&bp, type, s->le) >> off;
pal[i] = j;