diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-11-01 00:28:12 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-11-01 00:29:05 +0000 |
| commit | bb9bc1fc9848c24f8cc6378ce8eaf6f7ca4713c2 (patch) | |
| tree | bf946a08108a838d6e7a57a7bfe16d70b6c810ad | |
| parent | 6a712e7f6296a5b69a90612a6b7c721d0cc8c159 (diff) | |
| download | ffmpeg-bb9bc1fc9848c24f8cc6378ce8eaf6f7ca4713c2.tar.gz | |
flicvideo: return more meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavcodec/flicvideo.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 0514b7528f..7bba2998b1 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -134,10 +134,10 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) case 16 : avctx->pix_fmt = AV_PIX_FMT_RGB565; break; case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; /* Supposedly BGR, but havent any files to test with */ av_log(avctx, AV_LOG_ERROR, "24Bpp FLC/FLX is unsupported due to no test files.\n"); - return -1; + return AVERROR_PATCHWELCOME; default : av_log(avctx, AV_LOG_ERROR, "Unknown FLC/FLX depth of %d Bpp is unsupported.\n",depth); - return -1; + return AVERROR_INVALIDDATA; } avcodec_get_frame_defaults(&s->frame); @@ -165,7 +165,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, unsigned int chunk_size; int chunk_type; - int i, j; + int i, j, ret; int color_packets; int color_changes; @@ -187,9 +187,9 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, s->frame.reference = 3; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; - if (avctx->reget_buffer(avctx, &s->frame) < 0) { + if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return -1; + return ret; } pixels = s->frame.data[0]; @@ -485,7 +485,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, unsigned int chunk_size; int chunk_type; - int i, j; + int i, j, ret; int lines; int compressed_lines; @@ -502,9 +502,9 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, s->frame.reference = 3; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; - if (avctx->reget_buffer(avctx, &s->frame) < 0) { + if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return -1; + return ret; } pixels = s->frame.data[0]; @@ -759,7 +759,7 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx, const uint8_t *buf, int buf_size) { av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n"); - return -1; + return AVERROR_PATCHWELCOME; } static int flic_decode_frame(AVCodecContext *avctx, @@ -787,7 +787,7 @@ static int flic_decode_frame(AVCodecContext *avctx, /* the finite set of possibilites allowable by here. */ /* But in case we do, just error out. */ av_log(avctx, AV_LOG_ERROR, "Unknown FLC format, my science cannot explain how this happened.\n"); - return -1; + return AVERROR_INVALIDDATA; } |