diff ivi_common.h @ 11246:b75449aaea3e libavcodec

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.

--- a/ivi_common.h	Mon Feb 22 12:35:12 2010 +0000
+++ b/ivi_common.h	Mon Feb 22 13:51:32 2010 +0000
@@ -45,8 +45,8 @@
     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 @@
 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