summaryrefslogtreecommitdiff
path: root/libavcodec/dnxhddec.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-01-27 20:56:18 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-01-29 15:04:35 +0000
commit41e03e284ee7b0d4caa3a5d28681ad46e3105d65 (patch)
tree5f9f1ffc4eb08be3605d5989b2f8448e8d7487ed /libavcodec/dnxhddec.c
parent1279221cc4d63bc4449df86ae7a98e633f8be425 (diff)
DNxHD: More verbose error messages
Diffstat (limited to 'libavcodec/dnxhddec.c')
-rw-r--r--libavcodec/dnxhddec.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index ca67990156..4f714d86af 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -110,8 +110,11 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
static const uint8_t header_prefix444[] = { 0x00, 0x00, 0x02, 0x80, 0x02 };
int i, cid, ret;
- if (buf_size < 0x280)
+ if (buf_size < 0x280) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "buffer too small (%d < 640).\n",
+ buf_size);
return AVERROR_INVALIDDATA;
+ }
if (memcmp(buf, header_prefix, 5) && memcmp(buf, header_prefix444, 5)) {
av_log(ctx->avctx, AV_LOG_ERROR, "error in header\n");
@@ -168,7 +171,8 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
return ret;
if (buf_size < ctx->cid_table->coding_unit_size) {
- av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size\n");
+ av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size (%d < %d).\n",
+ buf_size, ctx->cid_table->coding_unit_size);
return AVERROR_INVALIDDATA;
}
@@ -192,7 +196,9 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
ctx->mb_scan_index[i] = AV_RB32(buf + 0x170 + (i << 2));
av_dlog(ctx->avctx, "mb scan index %d\n", ctx->mb_scan_index[i]);
if (buf_size < ctx->mb_scan_index[i] + 0x280) {
- av_log(ctx->avctx, AV_LOG_ERROR, "invalid mb scan index\n");
+ av_log(ctx->avctx, AV_LOG_ERROR,
+ "invalid mb scan index (%d < %d).\n",
+ buf_size, ctx->mb_scan_index[i] + 0x280);
return AVERROR_INVALIDDATA;
}
}