diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 20:29:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 20:33:56 +0200 |
| commit | 2b834a0605d9b6acb084ad9d1d9f04a7b4e19168 (patch) | |
| tree | 085d4df572e918d526204bc30186f5bdf4a1aea9 /libavcodec/huffman.c | |
| parent | a63b479d119107db5330239402b388cb399bf116 (diff) | |
| download | ffmpeg-2b834a0605d9b6acb084ad9d1d9f04a7b4e19168.tar.gz | |
avcodec/huffman: Allow specifying nb_bits to ff_huff_build_tree()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/huffman.c')
| -rw-r--r-- | libavcodec/huffman.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index 6e388292c2..2b64b3ece9 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -112,7 +112,7 @@ static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, } } -static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags) +static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags, int nb_bits) { int no_zero_count = !(flags & FF_HUFFMAN_FLAG_ZERO_COUNT); uint32_t bits[256]; @@ -122,7 +122,7 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags) get_tree_codes(bits, lens, xlat, nodes, head, 0, 0, &pos, no_zero_count); - return ff_init_vlc_sparse(vlc, FF_HUFFMAN_BITS, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0); + return ff_init_vlc_sparse(vlc, nb_bits, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0); } @@ -130,7 +130,7 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags) * nodes size must be 2*nb_codes * first nb_codes nodes.count must be set */ -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) { int i, j; @@ -168,7 +168,7 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, nodes[j].n0 = i; cur_node++; } - if (build_huff_tree(vlc, nodes, nb_codes * 2 - 2, flags) < 0) { + if (build_huff_tree(vlc, nodes, nb_codes * 2 - 2, flags, nb_bits) < 0) { av_log(avctx, AV_LOG_ERROR, "Error building tree\n"); return -1; } |