diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-10 15:52:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 16:00:31 +0100 |
| commit | 7cfea0d41cb05f099c2456f7b0797382adda7756 (patch) | |
| tree | cbed383f540b7ad77a29ae56be84365f75f84cdc | |
| parent | 8c08247990ca5246bf8f2c48fc2f3fd8a043f326 (diff) | |
| download | ffmpeg-7cfea0d41cb05f099c2456f7b0797382adda7756.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>
(cherry picked from commit d86d7b2486cd5c31db8e820d8a89554abf19567e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c28f07d0a8..2e0a5683de 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -994,7 +994,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) { |