From 6837bd6e49d537f3e8975a3b596abc1909daa6b6 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 20 Nov 2012 07:48:01 +0100
Subject: [PATCH 1/3] txd: return meaningful error codes.
---
libavcodec/txd.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index 8a10385b92..fc6e32f1f3 100644
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -51,6 +51,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
unsigned int y, v;
uint8_t *ptr;
uint32_t *pal;
+ int ret;
bytestream2_init(&gb, avpkt->data, avpkt->size);
version = bytestream2_get_le32(&gb);
@@ -65,7 +66,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (version < 8 || version > 9) {
av_log(avctx, AV_LOG_ERROR, "texture data version %i is unsupported\n",
version);
- return -1;
+ return AVERROR_PATCHWELCOME;
}
if (depth == 8) {
@@ -74,19 +75,19 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
avctx->pix_fmt = AV_PIX_FMT_RGB32;
} else {
av_log(avctx, AV_LOG_ERROR, "depth of %i is unsupported\n", depth);
- return -1;
+ return AVERROR_PATCHWELCOME;
}
if (p->data[0])
avctx->release_buffer(avctx, p);
- if (av_image_check_size(w, h, 0, avctx))
- return -1;
+ if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
+ return ret;
if (w != avctx->width || h != avctx->height)
avcodec_set_dimensions(avctx, w, h);
- if (ff_get_buffer(avctx, p) < 0) {
+ if ((ret = ff_get_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
}
p->pict_type = AV_PICTURE_TYPE_I;
@@ -141,7 +142,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
unsupported:
av_log(avctx, AV_LOG_ERROR, "unsupported d3d format (%08x)\n", d3d_format);
- return -1;
+ return AVERROR_PATCHWELCOME;
}
static av_cold int txd_end(AVCodecContext *avctx) {
From 0859eaa0122b63778a5bd9635a1e3ede07a0cd1c Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 20 Nov 2012 12:10:13 +0100
Subject: [PATCH 2/3] cyuv: return meaningful error codes.
---
libavcodec/cyuv.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
index 49cf64c08d..9c34c7525a 100644
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@@ -52,7 +52,7 @@ static av_cold int cyuv_decode_init(AVCodecContext *avctx)
s->width = avctx->width;
/* width needs to be divisible by 4 for this codec to work */
if (s->width & 0x3)
- return -1;
+ return AVERROR_INVALIDDATA;
s->height = avctx->height;
avctx->pix_fmt = AV_PIX_FMT_YUV411P;
@@ -83,6 +83,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
int stream_ptr;
unsigned char cur_byte;
int pixel_groups;
+ int ret;
if (avctx->codec_id == AV_CODEC_ID_AURA) {
y_table = u_table;
@@ -95,7 +96,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
if (buf_size != 48 + s->height * (s->width * 3 / 4)) {
av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n",
buf_size, 48 + s->height * (s->width * 3 / 4));
- return -1;
+ return AVERROR_INVALIDDATA;
}
/* pixel data starts 48 bytes in, after 3x16-byte tables */
@@ -106,9 +107,9 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
s->frame.reference = 0;
- if (ff_get_buffer(avctx, &s->frame) < 0) {
+ if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ return ret;
}
y_plane = s->frame.data[0];
From ade402804a0e811cd00862c90559121a793054a6 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 21 Nov 2012 10:26:55 +0100
Subject: [PATCH 3/3] eatgv: return meaningful error codes.
---
libavcodec/eatgv.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index 46644abead..7a93609968 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -73,7 +73,7 @@ static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst
src += 2;
if (src+3>src_end)
- return -1;
+ return AVERROR_INVALIDDATA;
size = AV_RB24(src);
src += 3;
@@ -146,7 +146,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b
const unsigned char *blocks_raw;
if(buf+12>buf_end)
- return -1;
+ return AVERROR_INVALIDDATA;
num_mvs = AV_RL16(&buf[0]);
num_blocks_raw = AV_RL16(&buf[2]);
@@ -175,7 +175,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b
mvbits = (num_mvs*2*10+31) & ~31;
if (buf+(mvbits>>3)+16*num_blocks_raw+8*num_blocks_packed>buf_end)
- return -1;
+ return AVERROR_INVALIDDATA;
init_get_bits(&gb, buf, mvbits);
for (i=0; i<num_mvs; i++) {
@@ -200,7 +200,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b
if (get_bits_left(&gb) < vector_bits *
(s->avctx->height/4) * (s->avctx->width/4))
- return -1;
+ return AVERROR_INVALIDDATA;
/* read vectors and build frame */
for(y=0; y<s->avctx->height/4; y++)
@@ -256,7 +256,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
int buf_size = avpkt->size;
TgvContext *s = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size;
- int chunk_type;
+ int chunk_type, ret;
chunk_type = AV_RL32(&buf[0]);
buf += EA_PREAMBLE_SIZE;
@@ -265,7 +265,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
int pal_count, i;
if(buf+12>buf_end) {
av_log(avctx, AV_LOG_WARNING, "truncated header\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->width = AV_RL16(&buf[0]);
@@ -284,8 +284,8 @@ static int tgv_decode_frame(AVCodecContext *avctx,
}
}
- if (av_image_check_size(s->width, s->height, 0, avctx))
- return -1;
+ if ((ret = av_image_check_size(s->width, s->height, 0, avctx)) < 0)
+ return ret;
/* shuffle */
FFSWAP(AVFrame, s->frame, s->last_frame);
@@ -310,7 +310,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
s->frame.pict_type = AV_PICTURE_TYPE_I;
if (unpack(buf, buf_end, s->frame.data[0], s->avctx->width, s->avctx->height)<0) {
av_log(avctx, AV_LOG_WARNING, "truncated intra frame\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
}else{
if (!s->last_frame.data[0]) {
@@ -321,7 +321,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
s->frame.pict_type = AV_PICTURE_TYPE_P;
if (tgv_decode_inter(s, buf, buf_end)<0) {
av_log(avctx, AV_LOG_WARNING, "truncated inter frame\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
}