virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Support decoding of targa files with 32bit palette.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2012-10-09 01:58:48 +02:00
parent a02762995b
commit b49d94e4f2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/targa.c
View File

@ -181,6 +181,7 @@ static int decode_frame(AVCodecContext *avctx,
return -1; return -1;
} }
switch (csize) { switch (csize) {
case 32: pal_sample_size = 4; break;
case 24: pal_sample_size = 3; break; case 24: pal_sample_size = 3; break;
case 16: case 16:
case 15: pal_sample_size = 2; break; case 15: pal_sample_size = 2; break;
@ -201,6 +202,10 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
switch (pal_sample_size) { switch (pal_sample_size) {
case 4:
for (t = 0; t < colors; t++)
*pal++ = bytestream2_get_le32u(&s->gb);
break;
case 3: case 3:
/* RGB24 */ /* RGB24 */
for (t = 0; t < colors; t++) for (t = 0; t < colors; t++)