har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'

Browse Source 
* commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe':
  tiffdec: remove an unneeded variable

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-13 03:54:11 +02:00
commit a64d6d5152
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/tiff.c
View File

@ -595,7 +595,6 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
int i, start; int i, start;
int j, k, pos; int j, k, pos;
int ret; int ret;
uint32_t *pal;
double *dp; double *dp;
ret = ff_tread_tag(&s->gb, s->le, &tag, &type, &count, &start); ret = ff_tread_tag(&s->gb, s->le, &tag, &type, &count, &start);
@ -781,20 +780,23 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->fill_order = value - 1; s->fill_order = value - 1;
break; break;
case TIFF_PAL: { case TIFF_PAL: {
pal = (uint32_t *) s->palette; GetByteContext pal_gb[3];
off = type_sizes[type]; off = type_sizes[type];
if (count / 3 > 256 || if (count / 3 > 256 ||
bytestream2_get_bytes_left(&s->gb) < count / 3 * off * 3) bytestream2_get_bytes_left(&s->gb) < count / 3 * off * 3)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
pal_gb[0] = pal_gb[1] = pal_gb[2] = s->gb;
bytestream2_skip(&pal_gb[1], count / 3 * off);
bytestream2_skip(&pal_gb[2], count / 3 * off * 2);
off = (type_sizes[type] - 1) << 3; off = (type_sizes[type] - 1) << 3;
for (k = 2; k >= 0; k--) { for (i = 0; i < count / 3; i++) {
for (i = 0; i < count / 3; i++) { uint32_t p = 0xFF000000;
if (k == 2) p |= (ff_tget(&pal_gb[0], type, s->le) >> off) << 16;
pal[i] = 0xFFU << 24; p |= (ff_tget(&pal_gb[1], type, s->le) >> off) << 8;
j = (ff_tget(&s->gb, type, s->le) >> off) << (k * 8); p |= ff_tget(&pal_gb[2], type, s->le) >> off;
pal[i] |= j; s->palette[i] = p;
}
} }
s->palette_is_set = 1; s->palette_is_set = 1;
break; break;