diff options
| author | Martin Vignali <martin.vignali@gmail.com> | 2017-04-25 22:52:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 12:20:15 +0200 |
| commit | 0ed8bab02f1b6548697335a649ec06a9ec467070 (patch) | |
| tree | bc08ffe97adeb2d1090cfd153085568d156eb5c8 | |
| parent | e66548345c6de7ef22da323a93b71d7782b3164d (diff) | |
| download | ffmpeg-0ed8bab02f1b6548697335a649ec06a9ec467070.tar.gz | |
libavcodec/exr : fix float to uint16 conversion for negative float value
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e46d63745215c04637e7797228bad36bce49d881)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/exr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index bc7e7218e0..47d30fa804 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -218,9 +218,9 @@ static union av_intfloat32 exr_half2float(uint16_t hf) * * @return normalized 16-bit unsigned int */ -static inline uint16_t exr_flt2uint(uint32_t v) +static inline uint16_t exr_flt2uint(int32_t v) { - unsigned int exp = v >> 23; + int32_t exp = v >> 23; // "HACK": negative values result in exp< 0, so clipping them to 0 // is also handled by this condition, avoids explicit check for sign bit. if (exp <= 127 + 7 - 24) // we would shift out all bits anyway |