RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-14 03:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Decode non-interleaved scans

Browse Source 
Originally committed as revision 7143 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2006-11-21 06:15:18 +00:00
parent eb10acec36
commit 426b11a833
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mjpeg.c
View File

@ -1643,12 +1643,6 @@ static int mjpeg_decode_sos(MJpegDecodeContext *s)
dprintf("decode_sos: invalid len (%d)\n", len); dprintf("decode_sos: invalid len (%d)\n", len);
return -1; return -1;
} }
/* XXX: only interleaved scan accepted */
if ((nb_components != s->nb_components) && !s->ls && !s->progressive)
{
dprintf("decode_sos: components(%d) mismatch\n", nb_components);
return -1;
}
vmax = 0; vmax = 0;
hmax = 0; hmax = 0;
for(i=0;i<nb_components;i++) { for(i=0;i<nb_components;i++) {
@ -1709,8 +1703,8 @@ static int mjpeg_decode_sos(MJpegDecodeContext *s)
s->mb_width = (s->width + s->h_max * block_size - 1) / (s->h_max * block_size); s->mb_width = (s->width + s->h_max * block_size - 1) / (s->h_max * block_size);
s->mb_height = (s->height + s->v_max * block_size - 1) / (s->v_max * block_size); s->mb_height = (s->height + s->v_max * block_size - 1) / (s->v_max * block_size);
} else if(!s->ls) { /* skip this for JPEG-LS */ } else if(!s->ls) { /* skip this for JPEG-LS */
h = s->h_max / s->h_scount[s->comp_index[0]]; h = s->h_max / s->h_scount[0];
v = s->v_max / s->v_scount[s->comp_index[0]]; v = s->v_max / s->v_scount[0];
s->mb_width = (s->width + h * block_size - 1) / (h * block_size); s->mb_width = (s->width + h * block_size - 1) / (h * block_size);
s->mb_height = (s->height + v * block_size - 1) / (v * block_size); s->mb_height = (s->height + v * block_size - 1) / (v * block_size);
s->nb_blocks[0] = 1; s->nb_blocks[0] = 1;