From 940e4bf9b9fcca463f804a3b847e94b97a7b858c Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Sat, 4 Aug 2007 13:03:12 +0000
Subject: [PATCH] 10l, use correct cid table
Originally committed as revision 9898 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/dnxhddec.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index e60b3e3f0c2..64be3b905ff 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -115,23 +115,23 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, int cid)
}
ctx->cid_table = &cid_table[index];
init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257,
- cid_table->ac_bits, 1, 1,
- cid_table->ac_codes, 2, 2, 0);
+ ctx->cid_table->ac_bits, 1, 1,
+ ctx->cid_table->ac_codes, 2, 2, 0);
init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, 12,
- cid_table->dc_bits, 1, 1,
- cid_table->dc_codes, 1, 1, 0);
+ ctx->cid_table->dc_bits, 1, 1,
+ ctx->cid_table->dc_codes, 1, 1, 0);
init_vlc(&ctx->run_vlc, DNXHD_VLC_BITS, 62,
- cid_table->run_bits, 1, 1,
- cid_table->run_codes, 2, 2, 0);
+ ctx->cid_table->run_bits, 1, 1,
+ ctx->cid_table->run_codes, 2, 2, 0);
- ctx->run = cid_table->run;
- ctx->ac_level = cid_table->ac_level;
- ctx->ac_run_flag = cid_table->ac_run_flag;
- ctx->ac_index_flag = cid_table->ac_index_flag;
- ctx->luma_weigth = cid_table->luma_weigth;
- ctx->chroma_weigth = cid_table->chroma_weigth;
+ ctx->run = ctx->cid_table->run;
+ ctx->ac_level = ctx->cid_table->ac_level;
+ ctx->ac_run_flag = ctx->cid_table->ac_run_flag;
+ ctx->ac_index_flag = ctx->cid_table->ac_index_flag;
+ ctx->luma_weigth = ctx->cid_table->luma_weigth;
+ ctx->chroma_weigth = ctx->cid_table->chroma_weigth;
- ctx->index_bits = cid_table->index_bits;
+ ctx->index_bits = ctx->cid_table->index_bits;
ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, ff_zigzag_direct);
}
--
GitLab