diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-11-14 15:11:23 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-01-06 13:31:39 +0100 |
commit | 620faee5d1069a29c2c73aeed1e8485f21565b34 (patch) | |
tree | bc60e931a456e36421753cadd2fc825d4f51af9a /libavcodec/aura.c | |
parent | 38de3365ca7e1e35fba87b8e0e119fdccc629669 (diff) | |
download | ffmpeg-620faee5d1069a29c2c73aeed1e8485f21565b34.tar.gz |
aura: return meaningful error codes.
Diffstat (limited to 'libavcodec/aura.c')
-rw-r--r-- | libavcodec/aura.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/aura.c b/libavcodec/aura.c index 4960bf8d54..7256dc8274 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -39,7 +39,7 @@ static av_cold int aura_decode_init(AVCodecContext *avctx) s->avctx = avctx; /* width needs to be divisible by 4 for this codec to work */ if (avctx->width & 0x3) - return -1; + return AVERROR(EINVAL); avctx->pix_fmt = AV_PIX_FMT_YUV422P; return 0; @@ -52,7 +52,7 @@ static int aura_decode_frame(AVCodecContext *avctx, AuraDecodeContext *s = avctx->priv_data; uint8_t *Y, *U, *V; uint8_t val; - int x, y; + int x, y, ret; const uint8_t *buf = pkt->data; /* prediction error tables (make it clear that they are signed values) */ @@ -61,7 +61,7 @@ static int aura_decode_frame(AVCodecContext *avctx, if (pkt->size != 48 + avctx->height * avctx->width) { av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n", pkt->size, 48 + avctx->height * avctx->width); - return -1; + return AVERROR_INVALIDDATA; } /* pixel data starts 48 bytes in, after 3x16-byte tables */ @@ -72,9 +72,9 @@ static int aura_decode_frame(AVCodecContext *avctx, s->frame.buffer_hints = FF_BUFFER_HINTS_VALID; s->frame.reference = 0; - if (ff_get_buffer(avctx, &s->frame) < 0) { + if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } Y = s->frame.data[0]; |