[FFmpeg-devel] [PATCH 3/3] Make the targa encoder return sane error values rather than -1.
Stefano Sabatini
stefano.sabatini-lala
Tue Oct 12 15:23:36 CEST 2010
---
libavcodec/targaenc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index 529c213..7e7ceff 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;
@@ -118,7 +118,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;
--
1.7.1
More information about the ffmpeg-devel
mailing list