[SCM] libav/experimental: Make the targa encoder return sane error values rather than -1.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e259eadcabe188988c0a9696707791f3497738c2
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Oct 12 18:44:28 2010 +0000

    Make the targa encoder return sane error values rather than -1.
    
    Originally committed as revision 25455 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index 325df46..1db0ea2 100644
--- a/libavcodec/targaenc.c
+++ b/libavcodec/targaenc.c
@@ -81,12 +81,12 @@ static int targa_encode_frame(AVCodecContext *avctx,
 
     if(avctx->width > 0xffff || avctx->height > 0xffff) {
         av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
     picsize = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
     if(buf_size < picsize + 45) {
         av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     p->pict_type= FF_I_TYPE;
@@ -115,7 +115,7 @@ static int targa_encode_frame(AVCodecContext *avctx,
     default:
         av_log(avctx, AV_LOG_ERROR, "Pixel format '%s' not supported.\n",
                avcodec_get_pix_fmt_name(avctx->pix_fmt));
-        return -1;
+        return AVERROR(EINVAL);
     }
     bpp = outbuf[16] >> 3;
 

-- 
Libav/FFmpeg packaging