[SCM] libav/experimental: 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

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8355572f91b0d2c423690345547006037e316d3b
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Thu Oct 1 05:52:38 2009 +0000

    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

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ad4187b..e8f0dd6 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:

-- 
Libav/FFmpeg packaging