har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smacker: return more meaningfull error codes

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-10-15 12:08:24 +00:00
parent ae237a117a
commit 916e40b5b4
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/smacker.c
View File

@ -362,18 +362,18 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
GetByteContext gb2; GetByteContext gb2;
GetBitContext gb; GetBitContext gb;
int blocks, blk, bw, bh; int blocks, blk, bw, bh;
int i; int i, ret;
int stride; int stride;
int flags; int flags;
if (avpkt->size <= 769) if (avpkt->size <= 769)
return 0; return AVERROR_INVALIDDATA;
smk->pic.reference = 3; smk->pic.reference = 3;
smk->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; smk->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
if(avctx->reget_buffer(avctx, &smk->pic) < 0){ if((ret = avctx->reget_buffer(avctx, &smk->pic)) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return ret;
} }
/* make the palette available on the way out */ /* make the palette available on the way out */
@ -528,11 +528,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
/* decode huffman trees from extradata */ /* decode huffman trees from extradata */
if(avctx->extradata_size < 16){ if(avctx->extradata_size < 16){
av_log(avctx, AV_LOG_ERROR, "Extradata missing!\n"); av_log(avctx, AV_LOG_ERROR, "Extradata missing!\n");
return -1; return AVERROR(EINVAL);
} }
if (decode_header_trees(c)) if (decode_header_trees(c))
return -1; return AVERROR_INVALIDDATA;
return 0; return 0;
} }