From 57aff8858194a931c8936d3f0cb092045c279734 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Fri, 3 Nov 2006 13:13:08 +0000 Subject: RGB32 support in Targa Originally committed as revision 6883 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/targa.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libavcodec/targa.c') diff --git a/libavcodec/targa.c b/libavcodec/targa.c index c3d6010d24..4eb18f87e8 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -68,6 +68,9 @@ static void targa_decode_rle(AVCodecContext *avctx, TargaContext *s, uint8_t *sr dst[1] = src[1]; dst[2] = src[2]; break; + case 4: + *((uint32_t*)dst) = LE_32(src); + break; } dst += depth; if(!type) @@ -128,6 +131,9 @@ static int decode_frame(AVCodecContext *avctx, case 24: avctx->pix_fmt = PIX_FMT_BGR24; break; + case 32: + avctx->pix_fmt = PIX_FMT_RGBA32; + break; default: av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", s->bpp); return -1; @@ -195,6 +201,10 @@ static int decode_frame(AVCodecContext *avctx, uint16_t *dst16 = (uint16_t*)dst; for(x = 0; x < s->width; x++) 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 #endif memcpy(dst, buf, s->width * ((s->bpp + 1) >> 3)); -- cgit v1.2.3