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

Originally committed as revision 13887 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Peter Ross 17 years ago committed by Aurelien Jacobs
parent d43cf68898
commit d47f16074f
  1. 3
      libavcodec/vp6.c

@ -202,10 +202,11 @@ static void vp6_parse_vector_models(vp56_context_t *s)
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[],

Loading…
Cancel
Save