OSDN Git Service

lavc MJPEG decoder is capable of decoding some extended sequential
authorKostya Shishkov <kostya.shishkov@gmail.com>
Thu, 1 Oct 2009 05:52:38 +0000 (05:52 +0000)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Thu, 1 Oct 2009 05:52:38 +0000 (05:52 +0000)
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

libavcodec/mjpegdec.c

index ad4187b..e8f0dd6 100644 (file)
@@ -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: