[FFmpeg-cvslog] dnxhddec: init scantable once permutation is set
Christophe Gisquet
git at videolan.org
Fri Oct 2 18:12:13 CEST 2015
ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet at gmail.com> | Thu Oct 1 22:01:27 2015 +0200| [74ef5449a6fb64f4c4be4bfd470dc17de5ecb561] | committer: Michael Niedermayer
dnxhddec: init scantable once permutation is set
Otherwise, the dsp may change without its permuation being applied.
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74ef5449a6fb64f4c4be4bfd470dc17de5ecb561
---
libavcodec/dnxhddec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index fce0fc9..296f7f7 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -127,8 +127,6 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid)
ctx->cid_table->run_bits, 1, 1,
ctx->cid_table->run_codes, 2, 2, 0);
- ff_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable,
- ff_zigzag_direct);
ctx->cid = cid;
}
return 0;
@@ -211,6 +209,8 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
if (ctx->bit_depth != old_bit_depth) {
ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
ff_idctdsp_init(&ctx->idsp, ctx->avctx);
+ ff_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable,
+ ff_zigzag_direct);
}
cid = AV_RB32(buf + 0x28);
More information about the ffmpeg-cvslog
mailing list