aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-05 01:29:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-05 01:39:20 +0200
commitb394ccfe47e7c6efb30ed0ec40efa87afb427d08 (patch)
tree8009b3a2d14a11c18ecbb3e8666579676df69376 /libavcodec/mjpegdec.c
parent38f8640df81e96b83ac8d33fddbe3ab3046d50ff (diff)
downloadandroid_external_ffmpeg-b394ccfe47e7c6efb30ed0ec40efa87afb427d08.tar.gz
android_external_ffmpeg-b394ccfe47e7c6efb30ed0ec40efa87afb427d08.tar.bz2
android_external_ffmpeg-b394ccfe47e7c6efb30ed0ec40efa87afb427d08.zip
avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transform
untested due to lack of sample Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index c18502bc55..9d74c6eaf3 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;