static VLC j_dc_vlc[2][8]; // [quant], [select]
static VLC j_orient_vlc[2][4]; // [quant], [select]
-static av_cold int x8_vlc_init(void)
+static av_cold void x8_vlc_init(void)
{
int i;
int offset = 0;
init_or_vlc(j_orient_vlc[1][i], x8_orient_lowquant_table[i][0]);
#undef init_or_vlc
- if (offset != sizeof(table) / sizeof(VLC_TYPE) / 2) {
- av_log(NULL, AV_LOG_ERROR, "table size %"SIZE_SPECIFIER" does not match needed %i\n",
- sizeof(table) / sizeof(VLC_TYPE) / 2, offset);
- return AVERROR_INVALIDDATA;
- }
-
- return 0;
+ av_assert2(offset == FF_ARRAY_ELEMS(table));
}
static void x8_reset_vlc_tables(IntraX8Context *w)
int block_last_index[12],
int mb_width, int mb_height)
{
- int ret = x8_vlc_init();
- if (ret < 0)
- return ret;
-
w->avctx = avctx;
w->idsp = *idsp;
w->mb_width = mb_width;
ff_intrax8dsp_init(&w->dsp);
ff_blockdsp_init(&w->bdsp, avctx);
+ x8_vlc_init();
+
return 0;
}