diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-10-17 15:42:24 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-10-19 00:08:02 +0000 |
| commit | 445f36d7c83f9edb67920be7a928243704b5453e (patch) | |
| tree | 8939f0ff169337284d2ae0f7f8ee1429dbe76895 | |
| parent | be536f084a989c91ce9bcb2068ae7b85310ad69c (diff) | |
| download | ffmpeg-445f36d7c83f9edb67920be7a928243704b5453e.tar.gz | |
kmvc: use meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavcodec/kmvc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index 34545947b2..2046d28f2e 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -266,6 +266,7 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, AVPa int header; int blocksize; const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); + int ret; bytestream2_init(&ctx->g, avpkt->data, avpkt->size); if (ctx->pic.data[0]) @@ -273,9 +274,9 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, AVPa ctx->pic.reference = 3; ctx->pic.buffer_hints = FF_BUFFER_HINTS_VALID; - if (avctx->get_buffer(avctx, &ctx->pic) < 0) { + if ((ret = avctx->get_buffer(avctx, &ctx->pic)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } header = bytestream2_get_byte(&ctx->g); @@ -323,7 +324,7 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, AVPa if (blocksize != 8 && blocksize != 127) { av_log(avctx, AV_LOG_ERROR, "Block size = %i\n", blocksize); - return -1; + return AVERROR_INVALIDDATA; } memset(ctx->cur, 0, 320 * 200); switch (header & KMVC_METHOD) { @@ -339,7 +340,7 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, AVPa break; default: av_log(avctx, AV_LOG_ERROR, "Unknown compression method %i\n", header & KMVC_METHOD); - return -1; + return AVERROR_INVALIDDATA; } out = ctx->pic.data[0]; @@ -380,7 +381,7 @@ static av_cold int decode_init(AVCodecContext * avctx) if (avctx->width > 320 || avctx->height > 200) { av_log(avctx, AV_LOG_ERROR, "KMVC supports frames <= 320x200\n"); - return -1; + return AVERROR_INVALIDDATA; } c->frm0 = av_mallocz(320 * 200); |