Commit 3ecb82dd authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos Committed by Vittorio Giovara

dnxhddec: Fix pixel format change

Regression introduced in 598f7d04.
Signed-off-by: 's avatarVittorio Giovara <vittorio.giovara@gmail.com>
parent 6503cbf8
......@@ -110,6 +110,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
static const uint8_t header_prefix[] = { 0x00, 0x00, 0x02, 0x80, 0x01 };
static const uint8_t header_prefix444[] = { 0x00, 0x00, 0x02, 0x80, 0x02 };
int i, cid, ret;
int old_bit_depth = ctx->bit_depth;
if (buf_size < 0x280) {
av_log(ctx->avctx, AV_LOG_ERROR, "buffer too small (%d < 640).\n",
......@@ -134,10 +135,6 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
ff_dlog(ctx->avctx, "width %d, height %d\n", ctx->width, ctx->height);
if (!ctx->bit_depth) {
ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
ff_idctdsp_init(&ctx->idsp, ctx->avctx);
}
if (buf[0x21] == 0x58) { /* 10 bit */
ctx->bit_depth = ctx->avctx->bits_per_raw_sample = 10;
......@@ -159,6 +156,10 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
buf[0x21]);
return AVERROR_INVALIDDATA;
}
if (ctx->bit_depth != old_bit_depth) {
ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
ff_idctdsp_init(&ctx->idsp, ctx->avctx);
}
cid = AV_RB32(buf + 0x28);
ff_dlog(ctx->avctx, "compression id %d\n", cid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment