diff options
| author | Martin Vignali <martin.vignali@gmail.com> | 2017-04-25 22:52:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:33 +0200 |
| commit | d1b23e5c0c6cd15e216f22c314111f1095359b03 (patch) | |
| tree | 3854fead4e4a5648d850e52b88b119d62a3efbbe /libavcodec/exr.c | |
| parent | 77dd220385f2db8a859c56f5bb938a468a3cfd9b (diff) | |
| download | ffmpeg-d1b23e5c0c6cd15e216f22c314111f1095359b03.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/exr.c')
| -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 8feb9bddef..4000068172 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -184,9 +184,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 |