summaryrefslogtreecommitdiff
path: root/libavcodec/rl2.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-17 07:37:08 +0100
committerAnton Khirnov <anton@khirnov.net>2013-01-06 13:31:40 +0100
commit126abaaaae7926cbac9fcc37fd897102ecc3bfa3 (patch)
treec1941ebd67150bca550828a246986e584fd8ba30 /libavcodec/rl2.c
parent7c8fceef6cea96681b6a2e52853e789f20a05dbf (diff)
rl2: return meaningful error codes.
Diffstat (limited to 'libavcodec/rl2.c')
-rw-r--r--libavcodec/rl2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index c9eb93eb62..da60e2493a 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -140,7 +140,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx)
/** parse extra data */
if(!avctx->extradata || avctx->extradata_size < EXTRADATA1_SIZE){
av_log(avctx, AV_LOG_ERROR, "invalid extradata size\n");
- return -1;
+ return AVERROR(EINVAL);
}
/** get frame_offset */
@@ -149,7 +149,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx)
if(s->video_base >= avctx->width * avctx->height){
av_log(avctx, AV_LOG_ERROR, "invalid video_base\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
/** initialize palette */
@@ -162,7 +162,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx)
if(back_size > 0){
unsigned char* back_frame = av_mallocz(avctx->width*avctx->height);
if(!back_frame)
- return -1;
+ return AVERROR(ENOMEM);
rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size,
back_frame,avctx->width,0);
s->back_frame = back_frame;
@@ -176,7 +176,7 @@ static int rl2_decode_frame(AVCodecContext *avctx,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ int ret, buf_size = avpkt->size;
Rl2Context *s = avctx->priv_data;
if(s->frame.data[0])
@@ -184,9 +184,9 @@ static int rl2_decode_frame(AVCodecContext *avctx,
/** get buffer */
s->frame.reference= 0;
- if(ff_get_buffer(avctx, &s->frame)) {
+ if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
}
/** run length decode */