Browse Source

rl2: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n1.1
Paul B Mahol 12 years ago
parent
commit
ed591ed842
1 changed files with 6 additions and 5 deletions
  1. +6
    -5
      libavcodec/rl2.c

+ 6
- 5
libavcodec/rl2.c View File

@@ -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_INVALIDDATA;
}

/** 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;
@@ -178,15 +178,16 @@ static int rl2_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
Rl2Context *s = avctx->priv_data;
int ret;

if(s->frame.data[0])
avctx->release_buffer(avctx, &s->frame);

/** get buffer */
s->frame.reference= 0;
if(avctx->get_buffer(avctx, &s->frame)) {
if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
return ret;
}

/** run length decode */


Loading…
Cancel
Save