Mercurial > libavcodec.hg
comparison mjpeg.c @ 2976:b5e8b6821274 libavcodec
10l to michael for breaking gcc 2.95 compile :)
author | rfelker |
---|---|
date | Tue, 20 Dec 2005 23:07:25 +0000 |
parents | 583b6ac45c07 |
children | bfabfdf9ce55 |
comparison
equal
deleted
inserted
replaced
2975:18e7ecf83aa2 | 2976:b5e8b6821274 |
---|---|
1482 static int mjpeg_decode_sos(MJpegDecodeContext *s) | 1482 static int mjpeg_decode_sos(MJpegDecodeContext *s) |
1483 { | 1483 { |
1484 int len, nb_components, i, h, v, predictor, point_transform; | 1484 int len, nb_components, i, h, v, predictor, point_transform; |
1485 int vmax, hmax, index, id; | 1485 int vmax, hmax, index, id; |
1486 const int block_size= s->lossless ? 1 : 8; | 1486 const int block_size= s->lossless ? 1 : 8; |
1487 int ilv; | |
1487 | 1488 |
1488 /* XXX: verify len field validity */ | 1489 /* XXX: verify len field validity */ |
1489 len = get_bits(&s->gb, 16); | 1490 len = get_bits(&s->gb, 16); |
1490 nb_components = get_bits(&s->gb, 8); | 1491 nb_components = get_bits(&s->gb, 8); |
1491 if (len != 6+2*nb_components) | 1492 if (len != 6+2*nb_components) |
1545 } | 1546 } |
1546 #endif | 1547 #endif |
1547 } | 1548 } |
1548 | 1549 |
1549 predictor= get_bits(&s->gb, 8); /* JPEG Ss / lossless JPEG predictor /JPEG-LS NEAR */ | 1550 predictor= get_bits(&s->gb, 8); /* JPEG Ss / lossless JPEG predictor /JPEG-LS NEAR */ |
1550 int ilv= get_bits(&s->gb, 8); /* JPEG Se / JPEG-LS ILV */ | 1551 ilv= get_bits(&s->gb, 8); /* JPEG Se / JPEG-LS ILV */ |
1551 skip_bits(&s->gb, 4); /* Ah */ | 1552 skip_bits(&s->gb, 4); /* Ah */ |
1552 point_transform= get_bits(&s->gb, 4); /* Al */ | 1553 point_transform= get_bits(&s->gb, 4); /* Al */ |
1553 | 1554 |
1554 for(i=0;i<nb_components;i++) | 1555 for(i=0;i<nb_components;i++) |
1555 s->last_dc[i] = 1024; | 1556 s->last_dc[i] = 1024; |