From 916e40b5b42ff7409b61a392cb7807c734b32e8f Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 15 Oct 2012 12:08:24 +0000 Subject: smacker: return more meaningfull error codes Signed-off-by: Paul B Mahol --- libavcodec/smacker.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 0291061e99..472d0ef99f 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -362,18 +362,18 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac GetByteContext gb2; GetBitContext gb; int blocks, blk, bw, bh; - int i; + int i, ret; int stride; int flags; if (avpkt->size <= 769) - return 0; + return AVERROR_INVALIDDATA; smk->pic.reference = 3; 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"); - return -1; + return ret; } /* 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 */ if(avctx->extradata_size < 16){ av_log(avctx, AV_LOG_ERROR, "Extradata missing!\n"); - return -1; + return AVERROR(EINVAL); } if (decode_header_trees(c)) - return -1; + return AVERROR_INVALIDDATA; return 0; } -- cgit v1.2.3