RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rl2: return meaningful error codes.

This commit is contained in:
Anton Khirnov 2012-11-17 07:37:08 +01:00
parent 7c8fceef6c
commit 126abaaaae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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(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 */