Mercurial > libavcodec.hg
comparison mjpegdec.c @ 10336:a554d7e29e99 libavcodec
lavc MJPEG decoder is capable of decoding some extended sequential
Huffman-compressed JPEG files, so make it decode those files
(samples are welcome).
This fixes issue 1420
| author | kostya |
|---|---|
| date | Thu, 01 Oct 2009 05:52:38 +0000 |
| parents | c78fd9154378 |
| children | 9d31db7bec63 |
comparison
equal
deleted
inserted
replaced
| 10335:3b0a2384ff9f | 10336:a554d7e29e99 |
|---|---|
| 1372 av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n"); | 1372 av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n"); |
| 1373 return -1; | 1373 return -1; |
| 1374 } | 1374 } |
| 1375 break; | 1375 break; |
| 1376 case SOF0: | 1376 case SOF0: |
| 1377 case SOF1: | |
| 1377 s->lossless=0; | 1378 s->lossless=0; |
| 1378 s->ls=0; | 1379 s->ls=0; |
| 1379 s->progressive=0; | 1380 s->progressive=0; |
| 1380 if (ff_mjpeg_decode_sof(s) < 0) | 1381 if (ff_mjpeg_decode_sof(s) < 0) |
| 1381 return -1; | 1382 return -1; |
| 1449 goto eoi_parser; | 1450 goto eoi_parser; |
| 1450 break; | 1451 break; |
| 1451 case DRI: | 1452 case DRI: |
| 1452 mjpeg_decode_dri(s); | 1453 mjpeg_decode_dri(s); |
| 1453 break; | 1454 break; |
| 1454 case SOF1: | |
| 1455 case SOF5: | 1455 case SOF5: |
| 1456 case SOF6: | 1456 case SOF6: |
| 1457 case SOF7: | 1457 case SOF7: |
| 1458 case SOF9: | 1458 case SOF9: |
| 1459 case SOF10: | 1459 case SOF10: |