[FFmpeg-devel] [PATCH 6/6] kmvc: use meaningful error codes

[Stefano Sabatini]

On date Wednesday 2012-10-17 15:55:19 +0000, Paul B Mahol encoded:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  libavcodec/kmvc.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c
> index 3454594..2046d28 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);

LGTM.
-- 
FFmpeg = Frenzy Fantastic Magnificient Plastic Enlightened Gadget