Revision 426b11a8 libavcodec/mjpeg.c
libavcodec/mjpeg.c  

1643  1643 
dprintf("decode_sos: invalid len (%d)\n", len); 
1644  1644 
return 1; 
1645  1645 
} 
1646 
/* XXX: only interleaved scan accepted */ 

1647 
if ((nb_components != s>nb_components) && !s>ls && !s>progressive) 

1648 
{ 

1649 
dprintf("decode_sos: components(%d) mismatch\n", nb_components); 

1650 
return 1; 

1651 
} 

1652  1646 
vmax = 0; 
1653  1647 
hmax = 0; 
1654  1648 
for(i=0;i<nb_components;i++) { 
...  ...  
1709  1703 
s>mb_width = (s>width + s>h_max * block_size  1) / (s>h_max * block_size); 
1710  1704 
s>mb_height = (s>height + s>v_max * block_size  1) / (s>v_max * block_size); 
1711  1705 
} else if(!s>ls) { /* skip this for JPEGLS */ 
1712 
h = s>h_max / s>h_scount[s>comp_index[0]];


1713 
v = s>v_max / s>v_scount[s>comp_index[0]];


1706 
h = s>h_max / s>h_scount[0];


1707 
v = s>v_max / s>v_scount[0];


1714  1708 
s>mb_width = (s>width + h * block_size  1) / (h * block_size); 
1715  1709 
s>mb_height = (s>height + v * block_size  1) / (v * block_size); 
1716  1710 
s>nb_blocks[0] = 1; 
Also available in: Unified diff