X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=driver.c;h=6dcc8b3da676161ecd60e05898a27ebe3d19bf3f;hb=75e1e46dafe538990da0ea3b021c82d5ed6d5e21;hp=cda257e3c90ba023ed8b465eeedf2e1417768aff;hpb=1cfb04470add4e31406785980e7ce14a8e9d0672;p=fjl diff --git a/driver.c b/driver.c index cda257e..6dcc8b3 100644 --- a/driver.c +++ b/driver.c @@ -120,10 +120,6 @@ void decode_ac_coefficients(const struct huffman_table* tbl, struct bit_source* possibly_refill(bits, DEHUF_AC_TABLE_BITS); unsigned lookup = peek_bits(bits, DEHUF_AC_TABLE_BITS); int code = tbl->ac_table_codes[lookup]; - int length = tbl->ac_table_length[lookup]; - int r = tbl->ac_table_skip[lookup]; - - assert(length == AC_DEHUF_SLOW_PATH || (length > 0 && length <= DEHUF_AC_TABLE_BITS)); if (__builtin_expect(code == AC_DEHUF_SLOW_PATH, 0)) { unsigned rs = read_huffman_symbol_no_refill(tbl, bits); @@ -145,6 +141,8 @@ void decode_ac_coefficients(const struct huffman_table* tbl, struct bit_source* coeff[unzigzag[i]] = extend(read_bits(bits, s), s); } else { + unsigned length = tbl->ac_table_length[lookup]; + int r = tbl->ac_table_skip[lookup]; assert(r >= 0); i += r; assert(bits->bits_available >= length);