Mercurial > libavcodec.hg

diff vp6.c @ 7093:544da38cb2c9 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vp6: ensure that huffman decoding table is sorted with descending symbol order Previous code worked by pure luck with glibc qsort implementation. patch by Peter Ross pross _at_ xvid _dot_ org
author aurel
date Sun, 22 Jun 2008 13:20:41 +0000
parents e943e1409077
children 21c3e313709e
line wrap: on
line diff
--- a/vp6.c	Sun Jun 22 13:01:24 2008 +0000
+++ b/vp6.c	Sun Jun 22 13:20:41 2008 +0000
@@ -202,10 +202,11 @@
                 model->vector_fdv[comp][node] = vp56_rac_gets_nn(c, 7);
 }
 
+/* nodes must ascend by count, but with descending symbol order */
 static int vp6_huff_cmp(const void *va, const void *vb)
 {
     const Node *a = va, *b = vb;
-    return a->count >= b->count;
+    return (a->count - b->count)*16 + (b->sym - a->sym);
 }
 
 static void vp6_build_huff_tree(vp56_context_t *s, uint8_t coeff_model[],