ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

c93: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-15 10:29:28 +01:00
parent 2b011a43e9
commit 11c3f2047e
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/c93.c
View File

@ -79,7 +79,7 @@ static inline int copy_block(AVCodecContext *avctx, uint8_t *to,
if (from_y + height > HEIGHT) { if (from_y + height > HEIGHT) {
av_log(avctx, AV_LOG_ERROR, "invalid offset %d during C93 decoding\n", av_log(avctx, AV_LOG_ERROR, "invalid offset %d during C93 decoding\n",
offset); offset);
return -1; return AVERROR_INVALIDDATA;
} }
if (overflow > 0) { if (overflow > 0) {
@ -123,16 +123,16 @@ static int decode_frame(AVCodecContext *avctx, void *data,
AVFrame *picture = data; AVFrame *picture = data;
GetByteContext gb; GetByteContext gb;
uint8_t *out; uint8_t *out;
int stride, i, x, y, b, bt = 0; int stride, ret, i, x, y, b, bt = 0;
c93->currentpic ^= 1; c93->currentpic ^= 1;
newpic->reference = 1; newpic->reference = 1;
newpic->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | newpic->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE; FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE;
if (avctx->reget_buffer(avctx, newpic)) { if ((ret = avctx->reget_buffer(avctx, newpic)) < 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;
} }
stride = newpic->linesize[0]; stride = newpic->linesize[0];
@ -162,8 +162,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
switch (block_type) { switch (block_type) {
case C93_8X8_FROM_PREV: case C93_8X8_FROM_PREV:
offset = bytestream2_get_le16(&gb); offset = bytestream2_get_le16(&gb);
if (copy_block(avctx, out, copy_from, offset, 8, stride)) if ((ret = copy_block(avctx, out, copy_from, offset, 8, stride)) < 0)
return -1; return ret;
break; break;
case C93_4X4_FROM_CURR: case C93_4X4_FROM_CURR:
@ -172,9 +172,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
for (j = 0; j < 8; j += 4) { for (j = 0; j < 8; j += 4) {
for (i = 0; i < 8; i += 4) { for (i = 0; i < 8; i += 4) {
offset = bytestream2_get_le16(&gb); offset = bytestream2_get_le16(&gb);
if (copy_block(avctx, &out[j*stride+i], if ((ret = copy_block(avctx, &out[j*stride+i],
copy_from, offset, 4, stride)) copy_from, offset, 4, stride)) < 0)
return -1; return ret;
} }
} }
break; break;
@ -221,7 +221,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
default: default:
av_log(avctx, AV_LOG_ERROR, "unexpected type %x at %dx%d\n", av_log(avctx, AV_LOG_ERROR, "unexpected type %x at %dx%d\n",
block_type, x, y); block_type, x, y);
return -1; return AVERROR_INVALIDDATA;
} }
bt >>= 4; bt >>= 4;
out += 8; out += 8;