[SCM] libav/experimental: use correct type for palette
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:03:18 UTC 2013
The following commit has been merged in the experimental branch:
commit 640b73e17d6977c6da550a42f3766d2de3dd6006
Author: Måns Rullgård <mans at mansr.com>
Date: Mon Jul 9 00:08:47 2007 +0000
use correct type for palette
Originally committed as revision 9554 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 97f4c73..6c1c346 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -155,7 +155,7 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t
int tag, type, count, off, value = 0;
uint8_t *src, *dst;
int i, j, ssize, soff, stride;
- int *pal;
+ uint32_t *pal;
uint8_t *rp, *gp, *bp;
tag = tget_short(&buf, s->le);
@@ -245,7 +245,7 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t
}
if(s->bpp == 8){
/* make default grayscale pal */
- pal = (int *) s->picture.data[1];
+ pal = (uint32_t *) s->picture.data[1];
for(i = 0; i < 256; i++)
pal[i] = i * 0x010101;
}
@@ -378,7 +378,7 @@ static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t
av_log(s->avctx, AV_LOG_ERROR, "Palette met but this is not palettized format\n");
return -1;
}
- pal = (int *) s->picture.data[1];
+ pal = (uint32_t *) s->picture.data[1];
off = type_sizes[type];
rp = buf;
gp = buf + count / 3 * off;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list