aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-01-10 15:52:09 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-10 15:59:27 +0100
commitd86d7b2486cd5c31db8e820d8a89554abf19567e (patch)
tree8a47eea9f6e7a2da902cf543b5766c85bf0ac4f2 /libavcodec
parentf587ed0cbbda2de85d0fb34a4fdca89ccb1f1e61 (diff)
downloadffmpeg-d86d7b2486cd5c31db8e820d8a89554abf19567e.tar.gz
avcodec/mjpegdec: Fix negative shift
Fixes: mjpeg_left_shift.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index c730e05d54..b1c5b67704 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -999,7 +999,7 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p
return -1;
left[i] = buffer[mb_x][i] =
- mask & (pred + (dc << point_transform));
+ mask & (pred + (dc * (1 << point_transform)));
}
if (s->restart_interval && !--s->restart_count) {