[SCM] libav/experimental: 100l: forgot to reset LS mode on new frame

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:56:40 UTC 2013


The following commit has been merged in the experimental branch:
commit 391fcef9a9f6da46219559b9b0874e2721a3fb76
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Wed Feb 21 18:10:25 2007 +0000

    100l: forgot to reset LS mode on new frame
    
    Originally committed as revision 8053 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 6940e0d..e13e12c 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -2128,18 +2128,21 @@ static int mjpeg_decode_frame(AVCodecContext *avctx,
                     break;
                 case SOF0:
                     s->lossless=0;
+                    s->ls=0;
                     s->progressive=0;
                     if (mjpeg_decode_sof(s) < 0)
                         return -1;
                     break;
                 case SOF2:
                     s->lossless=0;
+                    s->ls=0;
                     s->progressive=1;
                     if (mjpeg_decode_sof(s) < 0)
                         return -1;
                     break;
                 case SOF3:
                     s->lossless=1;
+                    s->ls=0;
                     s->progressive=0;
                     if (mjpeg_decode_sof(s) < 0)
                         return -1;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list