mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avcodec/exr: Fix undefined left shifts of negative numbers
Affected the FATE-tests exr-rgb-scanline-pxr24-half-uint32-13x9 and
exr-rgb-scanline-pxr24-uint32.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8b0f949906
)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
parent
2b177a46d2
commit
3eafbebe11
@ -892,7 +892,7 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src,
|
|||||||
in = ptr[3] + s->xdelta;
|
in = ptr[3] + s->xdelta;
|
||||||
|
|
||||||
for (j = 0; j < s->xdelta; ++j) {
|
for (j = 0; j < s->xdelta; ++j) {
|
||||||
uint32_t diff = (*(ptr[0]++) << 24) |
|
uint32_t diff = ((uint32_t)*(ptr[0]++) << 24) |
|
||||||
(*(ptr[1]++) << 16) |
|
(*(ptr[1]++) << 16) |
|
||||||
(*(ptr[2]++) << 8 ) |
|
(*(ptr[2]++) << 8 ) |
|
||||||
(*(ptr[3]++));
|
(*(ptr[3]++));
|
||||||
|
Loading…
Reference in New Issue
Block a user