|
|
|
@@ -96,27 +96,26 @@ static int init_default_huffman_tables(MJpegDecodeContext *s) |
|
|
|
int index; |
|
|
|
const uint8_t *bits; |
|
|
|
const uint8_t *values; |
|
|
|
int codes; |
|
|
|
int length; |
|
|
|
} ht[] = { |
|
|
|
{ 0, 0, avpriv_mjpeg_bits_dc_luminance, |
|
|
|
avpriv_mjpeg_val_dc, 12, 12 }, |
|
|
|
avpriv_mjpeg_val_dc, 12 }, |
|
|
|
{ 0, 1, avpriv_mjpeg_bits_dc_chrominance, |
|
|
|
avpriv_mjpeg_val_dc, 12, 12 }, |
|
|
|
avpriv_mjpeg_val_dc, 12 }, |
|
|
|
{ 1, 0, avpriv_mjpeg_bits_ac_luminance, |
|
|
|
avpriv_mjpeg_val_ac_luminance, 251, 162 }, |
|
|
|
avpriv_mjpeg_val_ac_luminance, 162 }, |
|
|
|
{ 1, 1, avpriv_mjpeg_bits_ac_chrominance, |
|
|
|
avpriv_mjpeg_val_ac_chrominance, 251, 162 }, |
|
|
|
avpriv_mjpeg_val_ac_chrominance, 162 }, |
|
|
|
{ 2, 0, avpriv_mjpeg_bits_ac_luminance, |
|
|
|
avpriv_mjpeg_val_ac_luminance, 251, 162 }, |
|
|
|
avpriv_mjpeg_val_ac_luminance, 162 }, |
|
|
|
{ 2, 1, avpriv_mjpeg_bits_ac_chrominance, |
|
|
|
avpriv_mjpeg_val_ac_chrominance, 251, 162 }, |
|
|
|
avpriv_mjpeg_val_ac_chrominance, 162 }, |
|
|
|
}; |
|
|
|
int i, ret; |
|
|
|
|
|
|
|
for (i = 0; i < FF_ARRAY_ELEMS(ht); i++) { |
|
|
|
ret = build_vlc(&s->vlcs[ht[i].class][ht[i].index], |
|
|
|
ht[i].bits, ht[i].values, ht[i].codes, |
|
|
|
ht[i].bits, ht[i].values, ht[i].length, |
|
|
|
0, ht[i].class == 1); |
|
|
|
if (ret < 0) |
|
|
|
return ret; |
|
|
|
|