X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=bitstream.c;h=638d19a3579b02053bd281e29e7f39d2bf54495c;hp=1593b99ee5bda9fe6f7e47b6ab63c445a10ad529;hb=33692c33f2effa9620064aec44c6196a8d830d05;hpb=9d8fdf8898418711558f70a9630b2444036d8285 diff --git a/bitstream.c b/bitstream.c index 1593b99e..638d19a3 100644 --- a/bitstream.c +++ b/bitstream.c @@ -166,29 +166,26 @@ void free_vlc(struct vlc *vlc) * \param gbc The getbit context structure. * \param table The vlc tables to use. * \param bits The number of bits which will be read at once. - * \param max_depth The number of times \a bits bits must be read to completely - * read the longest vlc code = (max_vlc_length + bits - 1) / bits. * * The \a bits parameter must be identical to the \a nb_bits value supplied to * \ref init_vlc(). * * \return The vlc code. */ -int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits, - int max_depth) +int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits) { int n, idx, nb_bits, code; idx = show_bits(gbc, bits); code = table[idx][0]; n = table[idx][1]; - if (max_depth > 1 && n < 0) { + if (n < 0) { skip_bits(gbc, bits); nb_bits = -n; idx = show_bits(gbc, nb_bits) + code; code = table[idx][0]; n = table[idx][1]; - if (max_depth > 2 && n < 0) { + if (n < 0) { skip_bits(gbc, nb_bits); nb_bits = -n; idx = show_bits(gbc, nb_bits) + code;