comparison vp6.c @ 7093:544da38cb2c9 libavcodec

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

7092:359237c9a10b

        for (node=0; node<8; node++)
            if (vp56_rac_get_prob(c, vp6_fdv_pct[comp][node]))
                model->vector_fdv[comp][node] = vp56_rac_gets_nn(c, 7);
}

static int vp6_huff_cmp(const void *va, const void *vb)
{
    const Node *a = va, *b = vb;
    return a->count >= b->count;
}

static void vp6_build_huff_tree(vp56_context_t *s, uint8_t coeff_model[],
                                const uint8_t *map, unsigned size, VLC *vlc)
{

7093:544da38cb2c9

        for (node=0; node<8; node++)
            if (vp56_rac_get_prob(c, vp6_fdv_pct[comp][node]))
                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)*16 + (b->sym - a->sym);
}

static void vp6_build_huff_tree(vp56_context_t *s, uint8_t coeff_model[],
                                const uint8_t *map, unsigned size, VLC *vlc)
{