ffmpeg | branch: release/2.6 | Carl Eugen Hoyos <ceho...@ag.or.at> | Sat Mar 28 17:36:02 2015 +0100| [8bd7bf1a3cb43584bec29452bca322efc45a60bd] | committer: Carl Eugen Hoyos
lavc/dnxhd: Fix pix_fmt change. Fixes ticket #4400. (cherry picked from commit dcac15a84c8fc087ec85b2172db13d2e0d543e50) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bd7bf1a3cb43584bec29452bca322efc45a60bd --- libavcodec/dnxhddec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 2b0e2de..0ed960d 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -119,6 +119,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", @@ -143,10 +144,6 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, av_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; @@ -170,6 +167,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); av_dlog(ctx->avctx, "compression id %d\n", cid); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
