[FFmpeg-cvslog] avcodec/utvideodec: Increase vlc len

Carl Eugen Hoyos git at videolan.org
Tue Jun 10 00:38:46 CEST 2014


ffmpeg | branch: release/1.2 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu May 29 08:41:15 2014 +0200| [0983720cf2b45d6f8b19ab406ff2f07c34caedf1] | committer: Carl Eugen Hoyos

avcodec/utvideodec: Increase vlc len

Fixes a regression since fb3e380 similar to ticket #2661,
reported by fluffrabbit at aol dot com.

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

Conflicts:
	libavcodec/utvideodec.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0983720cf2b45d6f8b19ab406ff2f07c34caedf1
---

 libavcodec/utvideodec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
index 259030a..3108159 100644
--- a/libavcodec/utvideodec.c
+++ b/libavcodec/utvideodec.c
@@ -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);



More information about the ffmpeg-cvslog mailing list