virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

RGB32 support in Targa

Browse Source 
Originally committed as revision 6883 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2006-11-03 13:13:08 +00:00
parent 25225c3773
commit 57aff88581
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/targa.c
View File

@ -68,6 +68,9 @@ static void targa_decode_rle(AVCodecContext *avctx, TargaContext *s, uint8_t *sr
dst[1] = src[1]; dst[1] = src[1];
dst[2] = src[2]; dst[2] = src[2];
break; break;
case 4:
*((uint32_t*)dst) = LE_32(src);
break;
} }
dst += depth; dst += depth;
if(!type) if(!type)
@ -128,6 +131,9 @@ static int decode_frame(AVCodecContext *avctx,
case 24: case 24:
avctx->pix_fmt = PIX_FMT_BGR24; avctx->pix_fmt = PIX_FMT_BGR24;
break; break;
case 32:
avctx->pix_fmt = PIX_FMT_RGBA32;
break;
default: default:
av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", s->bpp); av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", s->bpp);
return -1; return -1;
@ -195,6 +201,10 @@ static int decode_frame(AVCodecContext *avctx,
uint16_t *dst16 = (uint16_t*)dst; uint16_t *dst16 = (uint16_t*)dst;
for(x = 0; x < s->width; x++) for(x = 0; x < s->width; x++)
dst16[x] = LE_16(buf + x * 2); dst16[x] = LE_16(buf + x * 2);
}else if((s->bpp + 1) >> 3 == 4){
uint32_t *dst32 = (uint32_t*)dst;
for(x = 0; x < s->width; x++)
dst32[x] = LE_32(buf + x * 4);
}else }else
#endif #endif
memcpy(dst, buf, s->width * ((s->bpp + 1) >> 3)); memcpy(dst, buf, s->width * ((s->bpp + 1) >> 3));