[SCM] libav/experimental: Add support for TARGA images without RLE compression. Patch by Anne-Laure de Smit: gmail_address(annelaure, desmit)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e23dd95dc2cc1af813196c73630a66b498813f2a
Author: Anne-Laure de Smit <annelaure.desmit at gmail.com>
Date:   Thu Oct 1 12:20:08 2009 +0000

    Add support for TARGA images without RLE compression.
    Patch by Anne-Laure de Smit: gmail_address(annelaure, desmit)
    
    Originally committed as revision 20120 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index b24c6f3..9e481e6 100644
--- a/libavcodec/targaenc.c
+++ b/libavcodec/targaenc.c
@@ -76,7 +76,7 @@ static int targa_encode_frame(AVCodecContext *avctx,
                               unsigned char *outbuf,
                               int buf_size, void *data){
     AVFrame *p = data;
-    int bpp, picsize, datasize;
+    int bpp, picsize, datasize = -1;
     uint8_t *out;
 
     if(avctx->width > 0xffff || avctx->height > 0xffff) {
@@ -120,6 +120,7 @@ static int targa_encode_frame(AVCodecContext *avctx,
     out = outbuf + 18;  /* skip past the header we just output */
 
     /* try RLE compression */
+    if (avctx->coder_type != FF_CODER_TYPE_RAW)
     datasize = targa_encode_rle(out, picsize, p, bpp, avctx->width, avctx->height);
 
     /* if that worked well, mark the picture as RLE compressed */

-- 
Libav/FFmpeg packaging