decode: be more explicit about storing the last packet properties

[ffmpeg] / libavcodec / huffman.h

diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 3e935c0359669d8ec38534569f3ff1698ee992d1..87cbe4b421844bf16696e1f0797bcf10e524b05f 100644 (file)
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -27,7 +27,7 @@
 #define AVCODEC_HUFFMAN_H
 
 #include "avcodec.h"
-#include "get_bits.h"
+#include "vlc.h"
 
 typedef struct Node {
     int16_t  sym;
@@ -37,10 +37,10 @@ typedef struct Node {
 
 #define FF_HUFFMAN_FLAG_HNODE_FIRST 0x01
 #define FF_HUFFMAN_FLAG_ZERO_COUNT  0x02
-#define FF_HUFFMAN_BITS 9
+#define FF_HUFFMAN_BITS 10
 
 typedef int (*HuffCmp)(const void *va, const void *vb);
-int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
+int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits,
                        Node *nodes, HuffCmp cmp, int flags);
 
 void ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats);