diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 23:15:07 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 23:52:05 +0400 |
commit | 8c596864cd9512623eaf2cda90c50ffeb64bfc7a (patch) | |
tree | b2d5d5d27eb1177b011cf17dc5e93fe5ec787f09 /libavcodec/dnxhddec.c | |
parent | 28caf13ac394df5424a25304bda4608441bd85ec (diff) | |
parent | 28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8 (diff) |
Merge commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8'
* commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8':
dnxhddec: return proper error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddec.c')
-rw-r--r-- | libavcodec/dnxhddec.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 7040fc34b3..05c46589a0 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -75,7 +75,7 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid) if ((index = ff_dnxhd_get_cid_table(cid)) < 0) { av_log(ctx->avctx, AV_LOG_ERROR, "unsupported cid %d\n", cid); - return -1; + return AVERROR(ENOSYS); } if (ff_dnxhd_cid_table[index].bit_depth != ctx->bit_depth) { av_log(ctx->avctx, AV_LOG_ERROR, "bit depth mismatches %d %d\n", ff_dnxhd_cid_table[index].bit_depth, ctx->bit_depth); @@ -107,14 +107,14 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, const uint8_t *buf, int buf_size, int first_field) { static const uint8_t header_prefix[] = { 0x00, 0x00, 0x02, 0x80, 0x01 }; - int i, cid; + int i, cid, ret; if (buf_size < 0x280) - return -1; + return AVERROR_INVALIDDATA; if (memcmp(buf, header_prefix, 5)) { av_log(ctx->avctx, AV_LOG_ERROR, "error in header\n"); - return -1; + return AVERROR_INVALIDDATA; } if (buf[5] & 2) { /* interlaced */ ctx->cur_field = buf[5] & 1; @@ -149,12 +149,12 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, cid = AV_RB32(buf + 0x28); av_dlog(ctx->avctx, "compression id %d\n", cid); - if (dnxhd_init_vlc(ctx, cid) < 0) - return -1; + if ((ret = dnxhd_init_vlc(ctx, cid)) < 0) + return ret; if (buf_size < ctx->cid_table->coding_unit_size) { av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size\n"); - return -1; + return AVERROR_INVALIDDATA; } ctx->mb_width = ctx->width>>4; @@ -168,7 +168,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, if (ctx->mb_height > 68 || (ctx->mb_height << frame->interlaced_frame) > (ctx->height+15)>>4) { av_log(ctx->avctx, AV_LOG_ERROR, "mb height too big: %d\n", ctx->mb_height); - return -1; + return AVERROR_INVALIDDATA; } for (i = 0; i < ctx->mb_height; i++) { @@ -176,7 +176,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, av_dlog(ctx->avctx, "mb scan index %d\n", ctx->mb_scan_index[i]); if (buf_size < ctx->mb_scan_index[i] + 0x280LL) { av_log(ctx->avctx, AV_LOG_ERROR, "invalid mb scan index\n"); - return -1; + return AVERROR_INVALIDDATA; } } @@ -368,8 +368,8 @@ static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, av_dlog(avctx, "frame size %d\n", buf_size); decode_coding_unit: - if (dnxhd_decode_header(ctx, picture, buf, buf_size, first_field) < 0) - return -1; + if ((ret = dnxhd_decode_header(ctx, picture, buf, buf_size, first_field)) < 0) + return ret; if ((avctx->width || avctx->height) && (ctx->width != avctx->width || ctx->height != avctx->height)) { |