From 3ecb82dd4110108244373f007710df4c2ae572b6 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 29 Apr 2015 17:18:37 +0100 Subject: [PATCH] dnxhddec: Fix pixel format change Regression introduced in 598f7d046cbf306706623210c5baafa3b7cd1df3. Signed-off-by: Vittorio Giovara --- libavcodec/dnxhddec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 3558dee664..f821cb6b55 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -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);