virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

flicvideo: return more meaningful error codes

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-11-01 00:28:12 +00:00
parent 6a712e7f62
commit bb9bc1fc98
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/flicvideo.c
View File

@ -134,10 +134,10 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
case 16 : avctx->pix_fmt = AV_PIX_FMT_RGB565; break; 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 */ 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"); av_log(avctx, AV_LOG_ERROR, "24Bpp FLC/FLX is unsupported due to no test files.\n");
return -1; return AVERROR_PATCHWELCOME;
default : default :
av_log(avctx, AV_LOG_ERROR, "Unknown FLC/FLX depth of %d Bpp is unsupported.\n",depth); 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); avcodec_get_frame_defaults(&s->frame);
@ -165,7 +165,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
unsigned int chunk_size; unsigned int chunk_size;
int chunk_type; int chunk_type;
int i, j; int i, j, ret;
int color_packets; int color_packets;
int color_changes; int color_changes;
@ -187,9 +187,9 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
s->frame.reference = 3; s->frame.reference = 3;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; 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"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1; return ret;
} }
pixels = s->frame.data[0]; pixels = s->frame.data[0];
@ -485,7 +485,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
unsigned int chunk_size; unsigned int chunk_size;
int chunk_type; int chunk_type;
int i, j; int i, j, ret;
int lines; int lines;
int compressed_lines; int compressed_lines;
@ -502,9 +502,9 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
s->frame.reference = 3; s->frame.reference = 3;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; 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"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1; return ret;
} }
pixels = s->frame.data[0]; pixels = s->frame.data[0];
@ -759,7 +759,7 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n"); 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, 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. */ /* the finite set of possibilites allowable by here. */
/* But in case we do, just error out. */ /* 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"); av_log(avctx, AV_LOG_ERROR, "Unknown FLC format, my science cannot explain how this happened.\n");
return -1; return AVERROR_INVALIDDATA;
} }