diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-10-01 05:52:38 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2009-10-01 05:52:38 +0000 |
| commit | 8355572f91b0d2c423690345547006037e316d3b (patch) | |
| tree | eb697d92041f22d0a335bbf7f68700db627fb8dc | |
| parent | 5073cca4043deafd9cc29f447648cd9162381228 (diff) | |
| download | ffmpeg-8355572f91b0d2c423690345547006037e316d3b.tar.gz | |
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
Originally committed as revision 20113 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index ad4187b121..e8f0dd6032 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1374,6 +1374,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, } break; case SOF0: + case SOF1: s->lossless=0; s->ls=0; s->progressive=0; @@ -1451,7 +1452,6 @@ eoi_parser: case DRI: mjpeg_decode_dri(s); break; - case SOF1: case SOF5: case SOF6: case SOF7: |