diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 22:18:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 22:18:12 +0200 |
| commit | e60779b18cefd49443bb237cc9fc68795b3b9dfc (patch) | |
| tree | 61c760f54119c3e237cb9a11bf90eb964d769bf5 /libavcodec/dnxhdenc.c | |
| parent | 22aebf1bfefa2347a376acea5e27dab3f1d0e08f (diff) | |
| parent | 5bcdc099f313d46d0725050cba45a2c51b08f403 (diff) | |
| download | ffmpeg-e60779b18cefd49443bb237cc9fc68795b3b9dfc.tar.gz | |
Merge remote-tracking branch 'mans/dnxhd'
* mans/dnxhd:
dnxhddec: cache luma/chroma_weight*qscale tables for last qscale
dnxhddec: merge ac_{index,run}_flags
dnxhddec: store 2*level+1 in ac_level tables
dnxhddec: rearrange decode_dct_block loop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhdenc.c')
| -rw-r--r-- | libavcodec/dnxhdenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index cd1261af3c..e1f99706f7 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -122,9 +122,9 @@ static int dnxhd_init_vlc(DNXHDEncContext *ctx) alevel -= offset<<6; } for (j = 0; j < 257; j++) { - if (ctx->cid_table->ac_level[j] == alevel && - (!offset || (ctx->cid_table->ac_index_flag[j] && offset)) && - (!run || (ctx->cid_table->ac_run_flag [j] && run))) { + if (ctx->cid_table->ac_level[j] >> 1 == alevel && + (!offset || (ctx->cid_table->ac_flags[j] & 1) && offset) && + (!run || (ctx->cid_table->ac_flags[j] & 2) && run)) { assert(!ctx->vlc_codes[index]); if (alevel) { ctx->vlc_codes[index] = (ctx->cid_table->ac_codes[j]<<1)|(sign&1); |