RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Peter Ross 2008-06-22 13:20:41 +00:00 committed by Aurelien Jacobs
parent d43cf68898
commit d47f16074f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vp6.c
View File

@ -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); 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) static int vp6_huff_cmp(const void *va, const void *vb)
{ {
const Node *a = va, *b = 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[], static void vp6_build_huff_tree(vp56_context_t *s, uint8_t coeff_model[],