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/dnxhddata.h | |
| 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/dnxhddata.h')
| -rw-r--r-- | libavcodec/dnxhddata.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index 4d03a600f4..6e774b5c88 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -33,11 +33,12 @@ typedef struct { unsigned int coding_unit_size; int index_bits; int bit_depth; + int eob_index; const uint8_t *luma_weight, *chroma_weight; const uint8_t *dc_codes, *dc_bits; const uint16_t *ac_codes; const uint8_t *ac_bits, *ac_level; - const uint8_t *ac_run_flag, *ac_index_flag; + const uint8_t *ac_flags; const uint16_t *run_codes; const uint8_t *run_bits, *run; int bit_rates[5]; ///< Helpher to choose variants, rounded to nearest 5Mb/s |