diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-02-22 13:51:32 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-02-22 13:51:32 +0000 |
| commit | 9068f36dccb15646480e8751385f086215287655 (patch) | |
| tree | 426153ccde1d987d53cabd5afad64e60645527cd /libavcodec/ivi_common.h | |
| parent | bb29fee3a6a289f6b191177098ddce3720d8c417 (diff) | |
| download | ffmpeg-9068f36dccb15646480e8751385f086215287655.tar.gz | |
Macroblock and block Huffman code sets are to be used by both Indeo 4 and
Indeo 5, so make them global and move their initialization to the common place
as well. And fix static VLC initialization, as ff_ivi_create_huff_from_desc()
used old way to do so.
Originally committed as revision 21962 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ivi_common.h')
| -rw-r--r-- | libavcodec/ivi_common.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index dae4e956b3..5450e01398 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -45,8 +45,8 @@ typedef struct { uint8_t xbits[16]; } IVIHuffDesc; -extern const IVIHuffDesc ff_ivi_mb_huff_desc[8]; ///< static macroblock huffman tables -extern const IVIHuffDesc ff_ivi_blk_huff_desc[8]; ///< static block huffman tables +extern VLC ff_ivi_mb_vlc_tabs [8]; ///< static macroblock Huffman tables +extern VLC ff_ivi_blk_vlc_tabs[8]; ///< static block Huffman tables /** @@ -203,6 +203,11 @@ static inline int ivi_scale_mv(int mv, int mv_scale) int ff_ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag); /** + * Initializes static codes used for macroblock and block decoding. + */ +void ff_ivi_init_static_vlc(); + +/** * Decodes a huffman codebook descriptor from the bitstream. * * @param gb [in,out] the GetBit context |