avcodec/utvideodec: Increase vlc len
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 29 May 2014 06:41:15 +0000 (08:41 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Mon, 9 Jun 2014 22:21:05 +0000 (00:21 +0200)
Fixes a regression since fb3e380 similar to ticket #2661,
reported by fluffrabbit at aol dot com.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 673716c54b39eba9579a38ad222130e3f9549167)

Conflicts:
libavcodec/utvideodec.c

libavcodec/utvideodec.c

index 259030a..3108159 100644 (file)
@@ -70,7 +70,7 @@ static int build_huff(const uint8_t *src, VLC *vlc, int *fsym)
         code += 0x80000000u >> (he[i].len - 1);
     }
 
-    return ff_init_vlc_sparse(vlc, FFMIN(he[last].len, 9), last + 1,
+    return ff_init_vlc_sparse(vlc, FFMIN(he[last].len, 11), last + 1,
                               bits,  sizeof(*bits),  sizeof(*bits),
                               codes, sizeof(*codes), sizeof(*codes),
                               syms,  sizeof(*syms),  sizeof(*syms), 0);