[FFmpeg-cvslog] avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transform

Michael Niedermayer git at videolan.org
Thu Sep 5 01:47:47 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep  5 01:29:31 2013 +0200| [b394ccfe47e7c6efb30ed0ec40efa87afb427d08] | committer: Michael Niedermayer

avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transform

untested due to lack of sample

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b394ccfe47e7c6efb30ed0ec40efa87afb427d08
---

 libavcodec/mjpegdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index c18502b..9d74c6e 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -790,7 +790,7 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p
     uint16_t (*buffer)[4];
     int left[4], top[4], topleft[4];
     const int linesize = s->linesize[0];
-    const int mask     = (1 << s->bits) - 1;
+    const int mask     = ((1 << s->bits) - 1) << point_transform;
     int resync_mb_y = 0;
     int resync_mb_x = 0;
 



More information about the ffmpeg-cvslog mailing list