Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 19:38:35 +0000 (20:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 19:38:35 +0000 (20:38 +0100)
* commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65':
  DNxHD: More verbose error messages

Conflicts:
libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dnxhddec.c

@@@ -201,8 -195,10 +205,10 @@@ static int dnxhd_decode_header(DNXHDCon
      for (i = 0; i < ctx->mb_height; i++) {
          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) {
 +        if (buf_size < ctx->mb_scan_index[i] + 0x280LL) {
-             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;
          }
      }