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 00:21:49 +0200 |
| commit | 3ffde707dfa3cf240bb61cf91a74c2129a0489db (patch) | |
| tree | ed7251d1cdf6a8042134c1160255842fb69edc44 /libavcodec | |
| parent | 2ff9e21f7fcecbda36669b95ff8b30b5c34bd371 (diff) | |
| download | ffmpeg-3ffde707dfa3cf240bb61cf91a74c2129a0489db.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>
Diffstat (limited to 'libavcodec')
| -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 e5dea0756d..ec940222b2 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -220,9 +220,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 |