Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer authored on 2012/10/14 10:17:13... | ... |
@@ -87,7 +87,7 @@ avs_decode_frame(AVCodecContext * avctx, |
87 | 87 |
buf += 4; |
88 | 88 |
for (i=first; i<last; i++, buf+=3) { |
89 | 89 |
pal[i] = (buf[0] << 18) | (buf[1] << 10) | (buf[2] << 2); |
90 |
- pal[i] |= 0xFF << 24 | (pal[i] >> 6) & 0x30303; |
|
90 |
+ pal[i] |= 0xFFU << 24 | (pal[i] >> 6) & 0x30303; |
|
91 | 91 |
} |
92 | 92 |
|
93 | 93 |
sub_type = buf[0]; |
... | ... |
@@ -82,7 +82,7 @@ static int bfi_decode_frame(AVCodecContext *avctx, void *data, |
82 | 82 |
pal = (uint32_t *)bfi->frame.data[1]; |
83 | 83 |
for (i = 0; i < avctx->extradata_size / 3; i++) { |
84 | 84 |
int shift = 16; |
85 |
- *pal = 0xFF << 24; |
|
85 |
+ *pal = 0xFFU << 24; |
|
86 | 86 |
for (j = 0; j < 3; j++, shift -= 8) |
87 | 87 |
*pal += ((avctx->extradata[i * 3 + j] << 2) | |
88 | 88 |
(avctx->extradata[i * 3 + j] >> 4)) << shift; |
... | ... |
@@ -227,7 +227,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac |
227 | 227 |
return AVERROR_INVALIDDATA; |
228 | 228 |
} |
229 | 229 |
for (i = 0; i < 256; i++) |
230 |
- c->pal[i] = 0xFF << 24 | bytestream_get_be24(&c->stream); |
|
230 |
+ c->pal[i] = 0xFFU << 24 | bytestream_get_be24(&c->stream); |
|
231 | 231 |
} |
232 | 232 |
if (type & BMV_SCROLL) { |
233 | 233 |
if (c->stream - pkt->data > pkt->size - 2) { |
... | ... |
@@ -126,7 +126,7 @@ static void cdg_load_palette(CDGraphicsContext *cc, uint8_t *data, int low) |
126 | 126 |
r = ((color >> 8) & 0x000F) * 17; |
127 | 127 |
g = ((color >> 4) & 0x000F) * 17; |
128 | 128 |
b = ((color ) & 0x000F) * 17; |
129 |
- palette[i + array_offset] = 0xFF << 24 | r << 16 | g << 8 | b; |
|
129 |
+ palette[i + array_offset] = 0xFFU << 24 | r << 16 | g << 8 | b; |
|
130 | 130 |
} |
131 | 131 |
cc->frame.palette_has_changed = 1; |
132 | 132 |
} |
... | ... |
@@ -345,7 +345,7 @@ static int dfa_decode_frame(AVCodecContext *avctx, |
345 | 345 |
pal_elems = FFMIN(chunk_size / 3, 256); |
346 | 346 |
for (i = 0; i < pal_elems; i++) { |
347 | 347 |
s->pal[i] = bytestream2_get_be24(&gb) << 2; |
348 |
- s->pal[i] |= 0xFF << 24 | (s->pal[i] >> 6) & 0x30303; |
|
348 |
+ s->pal[i] |= 0xFFU << 24 | (s->pal[i] >> 6) & 0x30303; |
|
349 | 349 |
} |
350 | 350 |
s->pic.palette_has_changed = 1; |
351 | 351 |
} else if (chunk_type <= 9) { |
... | ... |
@@ -209,7 +209,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac |
209 | 209 |
r = *buf++; |
210 | 210 |
g = *buf++; |
211 | 211 |
b = *buf++; |
212 |
- c->pal[i] = 0xFF << 24 | r << 16 | g << 8 | b; |
|
212 |
+ c->pal[i] = 0xFFU << 24 | r << 16 | g << 8 | b; |
|
213 | 213 |
} |
214 | 214 |
pc = 1; |
215 | 215 |
buf_size -= 768+4; |
... | ... |
@@ -142,7 +142,7 @@ static void cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t |
142 | 142 |
|
143 | 143 |
buf += 16; |
144 | 144 |
for (i=pal_start; i<pal_start+pal_count && i<AVPALETTE_COUNT && buf_end - buf >= 3; i++) { |
145 |
- s->palette[i] = 0xFF << 24 | AV_RB24(buf); |
|
145 |
+ s->palette[i] = 0xFFU << 24 | AV_RB24(buf); |
|
146 | 146 |
buf += 3; |
147 | 147 |
} |
148 | 148 |
} |
... | ... |
@@ -286,7 +286,7 @@ static int tgv_decode_frame(AVCodecContext *avctx, |
286 | 286 |
pal_count = AV_RL16(&buf[6]); |
287 | 287 |
buf += 12; |
288 | 288 |
for(i=0; i<pal_count && i<AVPALETTE_COUNT && buf_end - buf >= 3; i++) { |
289 |
- s->palette[i] = 0xFF << 24 | AV_RB24(buf); |
|
289 |
+ s->palette[i] = 0xFFU << 24 | AV_RB24(buf); |
|
290 | 290 |
buf += 3; |
291 | 291 |
} |
292 | 292 |
} |
... | ... |
@@ -256,7 +256,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, |
256 | 256 |
r = bytestream2_get_byte(&g2) << color_shift; |
257 | 257 |
g = bytestream2_get_byte(&g2) << color_shift; |
258 | 258 |
b = bytestream2_get_byte(&g2) << color_shift; |
259 |
- entry = 0xFF << 24 | r << 16 | g << 8 | b; |
|
259 |
+ entry = 0xFFU << 24 | r << 16 | g << 8 | b; |
|
260 | 260 |
if (color_shift == 2) |
261 | 261 |
entry |= entry >> 6 & 0x30303; |
262 | 262 |
if (s->palette[palette_ptr] != entry) |
... | ... |
@@ -177,7 +177,7 @@ static int decode_frame(AVCodecContext *avctx, |
177 | 177 |
if (buf_end - buf >= AVPALETTE_COUNT * 3) { |
178 | 178 |
for (i = 0; i < AVPALETTE_COUNT; i++) { |
179 | 179 |
uint32_t pal = AV_RB24(buf); |
180 |
- s->palette[i] = 0xFF << 24 | pal << 2 | ((pal >> 4) & 0x30303); |
|
180 |
+ s->palette[i] = 0xFFU << 24 | pal << 2 | ((pal >> 4) & 0x30303); |
|
181 | 181 |
buf += 3; |
182 | 182 |
} |
183 | 183 |
s->palette_has_changed = 1; |
... | ... |
@@ -389,7 +389,7 @@ static av_cold int decode_init(AVCodecContext * avctx) |
389 | 389 |
c->prev = c->frm1; |
390 | 390 |
|
391 | 391 |
for (i = 0; i < 256; i++) { |
392 |
- c->pal[i] = 0xFF << 24 | i * 0x10101; |
|
392 |
+ c->pal[i] = 0xFFU << 24 | i * 0x10101; |
|
393 | 393 |
} |
394 | 394 |
|
395 | 395 |
if (avctx->extradata_size < 12) { |
... | ... |
@@ -72,7 +72,7 @@ static int mm_decode_pal(MmContext *s) |
72 | 72 |
|
73 | 73 |
bytestream2_skip(&s->gb, 4); |
74 | 74 |
for (i = 0; i < 128; i++) { |
75 |
- s->palette[i] = 0xFF << 24 | bytestream2_get_be24(&s->gb); |
|
75 |
+ s->palette[i] = 0xFFU << 24 | bytestream2_get_be24(&s->gb); |
|
76 | 76 |
s->palette[i+128] = s->palette[i]<<2; |
77 | 77 |
} |
78 | 78 |
|
... | ... |
@@ -129,7 +129,7 @@ static int decode_pal(MSS12Context *ctx, ArithCoder *acoder) |
129 | 129 |
r = arith_get_bits(acoder, 8); |
130 | 130 |
g = arith_get_bits(acoder, 8); |
131 | 131 |
b = arith_get_bits(acoder, 8); |
132 |
- *pal++ = (0xFF << 24) | (r << 16) | (g << 8) | b; |
|
132 |
+ *pal++ = (0xFFU << 24) | (r << 16) | (g << 8) | b; |
|
133 | 133 |
} |
134 | 134 |
|
135 | 135 |
return !!ncol; |
... | ... |
@@ -645,7 +645,7 @@ av_cold int ff_mss12_decode_init(MSS12Context *c, int version, |
645 | 645 |
} |
646 | 646 |
|
647 | 647 |
for (i = 0; i < 256; i++) |
648 |
- c->pal[i] = 0xFF << 24 | AV_RB24(avctx->extradata + 52 + |
|
648 |
+ c->pal[i] = 0xFFU << 24 | AV_RB24(avctx->extradata + 52 + |
|
649 | 649 |
(version ? 8 : 0) + i * 3); |
650 | 650 |
|
651 | 651 |
c->mask_stride = FFALIGN(avctx->width, 16); |
... | ... |
@@ -592,10 +592,10 @@ static int decode_frame(AVCodecContext *avctx, |
592 | 592 |
r = bytestream2_get_byte(&s->gb); |
593 | 593 |
g = bytestream2_get_byte(&s->gb); |
594 | 594 |
b = bytestream2_get_byte(&s->gb); |
595 |
- s->palette[i] = (0xff << 24) | (r << 16) | (g << 8) | b; |
|
595 |
+ s->palette[i] = (0xFFU << 24) | (r << 16) | (g << 8) | b; |
|
596 | 596 |
} |
597 | 597 |
for(;i<256;i++) { |
598 |
- s->palette[i] = (0xff << 24); |
|
598 |
+ s->palette[i] = (0xFFU << 24); |
|
599 | 599 |
} |
600 | 600 |
s->state |= PNG_PLTE; |
601 | 601 |
bytestream2_skip(&s->gb, 4); /* crc */ |
... | ... |
@@ -154,7 +154,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx) |
154 | 154 |
|
155 | 155 |
/** initialize palette */ |
156 | 156 |
for(i=0;i<AVPALETTE_COUNT;i++) |
157 |
- s->palette[i] = 0xFF << 24 | AV_RB24(&avctx->extradata[6 + i * 3]); |
|
157 |
+ s->palette[i] = 0xFFU << 24 | AV_RB24(&avctx->extradata[6 + i * 3]); |
|
158 | 158 |
|
159 | 159 |
/** decode background frame if present */ |
160 | 160 |
back_size = avctx->extradata_size - EXTRADATA1_SIZE; |
... | ... |
@@ -284,7 +284,7 @@ static av_cold int decode_init(AVCodecContext *avctx) |
284 | 284 |
|
285 | 285 |
ctx->subversion = AV_RL16(avctx->extradata); |
286 | 286 |
for (i = 0; i < 256; i++) |
287 |
- ctx->pal[i] = 0xFF << 24 | AV_RL32(avctx->extradata + 2 + i * 4); |
|
287 |
+ ctx->pal[i] = 0xFFU << 24 | AV_RL32(avctx->extradata + 2 + i * 4); |
|
288 | 288 |
} |
289 | 289 |
|
290 | 290 |
return 0; |
... | ... |
@@ -1172,7 +1172,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, |
1172 | 1172 |
return AVERROR_INVALIDDATA; |
1173 | 1173 |
} |
1174 | 1174 |
for (i = 0; i < 256; i++) |
1175 |
- ctx->pal[i] = 0xFF << 24 | bytestream2_get_be24u(&ctx->gb); |
|
1175 |
+ ctx->pal[i] = 0xFFU << 24 | bytestream2_get_be24u(&ctx->gb); |
|
1176 | 1176 |
break; |
1177 | 1177 |
case MKBETAG('F', 'O', 'B', 'J'): |
1178 | 1178 |
if (size < 16) |
... | ... |
@@ -1190,7 +1190,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, |
1190 | 1190 |
int t = (ctx->pal[i] >> (16 - j * 8)) & 0xFF; |
1191 | 1191 |
tmp[j] = av_clip_uint8((t * 129 + ctx->delta_pal[i * 3 + j]) >> 7); |
1192 | 1192 |
} |
1193 |
- ctx->pal[i] = 0xFF << 24 | AV_RB24(tmp); |
|
1193 |
+ ctx->pal[i] = 0xFFU << 24 | AV_RB24(tmp); |
|
1194 | 1194 |
} |
1195 | 1195 |
} else { |
1196 | 1196 |
if (size < 768 * 2 + 4) { |
... | ... |
@@ -1203,7 +1203,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, |
1203 | 1203 |
ctx->delta_pal[i] = bytestream2_get_le16u(&ctx->gb); |
1204 | 1204 |
if (size >= 768 * 5 + 4) { |
1205 | 1205 |
for (i = 0; i < 256; i++) |
1206 |
- ctx->pal[i] = 0xFF << 24 | bytestream2_get_be24u(&ctx->gb); |
|
1206 |
+ ctx->pal[i] = 0xFFU << 24 | bytestream2_get_be24u(&ctx->gb); |
|
1207 | 1207 |
} else { |
1208 | 1208 |
memset(ctx->pal, 0, sizeof(ctx->pal)); |
1209 | 1209 |
} |
... | ... |
@@ -388,7 +388,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac |
388 | 388 |
smk->pic.pict_type = AV_PICTURE_TYPE_P; |
389 | 389 |
|
390 | 390 |
for(i = 0; i < 256; i++) |
391 |
- *pal++ = 0xFF << 24 | bytestream2_get_be24u(&gb2); |
|
391 |
+ *pal++ = 0xFFU << 24 | bytestream2_get_be24u(&gb2); |
|
392 | 392 |
|
393 | 393 |
last_reset(smk->mmap_tbl, smk->mmap_last); |
394 | 394 |
last_reset(smk->mclr_tbl, smk->mclr_last); |
... | ... |
@@ -178,7 +178,7 @@ static int seqvideo_decode(SeqVideoContext *seq, const unsigned char *data, int |
178 | 178 |
for (i = 0; i < 256; i++) { |
179 | 179 |
for (j = 0; j < 3; j++, data++) |
180 | 180 |
c[j] = (*data << 2) | (*data >> 4); |
181 |
- palette[i] = 0xFF << 24 | AV_RB24(c); |
|
181 |
+ palette[i] = 0xFFU << 24 | AV_RB24(c); |
|
182 | 182 |
} |
183 | 183 |
seq->frame.palette_has_changed = 1; |
184 | 184 |
} |
... | ... |
@@ -607,7 +607,7 @@ static int init_image(TiffContext *s) |
607 | 607 |
/* make default grayscale pal */ |
608 | 608 |
pal = (uint32_t *) s->picture.data[1]; |
609 | 609 |
for (i = 0; i < 1<<s->bpp; i++) |
610 |
- pal[i] = 0xFF << 24 | i * 255 / ((1<<s->bpp) - 1) * 0x010101; |
|
610 |
+ pal[i] = 0xFFU << 24 | i * 255 / ((1<<s->bpp) - 1) * 0x010101; |
|
611 | 611 |
} |
612 | 612 |
} |
613 | 613 |
return 0; |
... | ... |
@@ -824,7 +824,7 @@ static int tiff_decode_tag(TiffContext *s) |
824 | 824 |
for (k = 2; k >= 0; k--) { |
825 | 825 |
for (i = 0; i < count / 3; i++) { |
826 | 826 |
if (k == 2) |
827 |
- pal[i] = 0xff << 24; |
|
827 |
+ pal[i] = 0xFFU << 24; |
|
828 | 828 |
j = (tget(&s->gb, type, s->le) >> off) << (k * 8); |
829 | 829 |
pal[i] |= j; |
830 | 830 |
} |
... | ... |
@@ -265,7 +265,7 @@ static void vmd_decode(VmdVideoContext *s) |
265 | 265 |
r = *p++ * 4; |
266 | 266 |
g = *p++ * 4; |
267 | 267 |
b = *p++ * 4; |
268 |
- palette32[i] = 0xFF << 24 | r << 16 | g << 8 | b; |
|
268 |
+ palette32[i] = 0xFFU << 24 | r << 16 | g << 8 | b; |
|
269 | 269 |
palette32[i] |= palette32[i] >> 6 & 0x30303; |
270 | 270 |
} |
271 | 271 |
} |
... | ... |
@@ -416,7 +416,7 @@ static int vqa_decode_chunk(VqaContext *s) |
416 | 416 |
r = bytestream2_get_byteu(&s->gb) * 4; |
417 | 417 |
g = bytestream2_get_byteu(&s->gb) * 4; |
418 | 418 |
b = bytestream2_get_byteu(&s->gb) * 4; |
419 |
- s->palette[i] = 0xFF << 24 | r << 16 | g << 8 | b; |
|
419 |
+ s->palette[i] = 0xFFU << 24 | r << 16 | g << 8 | b; |
|
420 | 420 |
s->palette[i] |= s->palette[i] >> 6 & 0x30303; |
421 | 421 |
} |
422 | 422 |
} |
... | ... |
@@ -235,7 +235,7 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size, |
235 | 235 |
palette[i + firstcolor] = (s->srcptr[0] << 18) | |
236 | 236 |
(s->srcptr[1] << 10) | |
237 | 237 |
(s->srcptr[2] << 2); |
238 |
- palette[i + firstcolor] |= 0xFF << 24 | |
|
238 |
+ palette[i + firstcolor] |= 0xFFU << 24 | |
|
239 | 239 |
(palette[i + firstcolor] >> 6) & 0x30303; |
240 | 240 |
} |
241 | 241 |
|