[FFmpeg-cvslog] r20113 - trunk/libavcodec/mjpegdec.c

kostya subversion
Thu Oct 1 07:52:39 CEST 2009


Author: kostya
Date: Thu Oct  1 07:52:38 2009
New Revision: 20113

Log:
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

Modified:
   trunk/libavcodec/mjpegdec.c

Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c	Thu Oct  1 07:46:17 2009	(r20112)
+++ trunk/libavcodec/mjpegdec.c	Thu Oct  1 07:52:38 2009	(r20113)
@@ -1374,6 +1374,7 @@ int ff_mjpeg_decode_frame(AVCodecContext
                     }
                     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:



More information about the ffmpeg-cvslog mailing list