diff options
author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-11-08 17:19:10 +0100 |
---|---|---|
committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-11-08 21:06:40 +0100 |
commit | 9ac61e73d0843ec4b83f4e3d47eded73234e406e (patch) | |
tree | 52f40c2e062b62590a52fc829634b39e62b5af44 | |
parent | f3866a14c3c2949fad16267e9f2977ba9d7b5504 (diff) | |
download | ffmpeg-9ac61e73d0843ec4b83f4e3d47eded73234e406e.tar.gz |
softfloat: handle INT_MIN correctly in av_int2sf
Otherwise v=INT_MIN doesn't get normalized and thus triggers av_assert2
in other functions.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r-- | libavutil/softfloat.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index 4cc3ceb646..5b285e3d9b 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -153,7 +153,12 @@ static inline av_const SoftFloat av_sub_sf(SoftFloat a, SoftFloat b){ * @returns a SoftFloat with value v * 2^frac_bits */ static inline av_const SoftFloat av_int2sf(int v, int frac_bits){ - return av_normalize_sf((SoftFloat){v, ONE_BITS + 1 - frac_bits}); + int exp_offset = 0; + if(v == INT_MIN){ + exp_offset = 1; + v>>=1; + } + return av_normalize_sf(av_normalize1_sf((SoftFloat){v, ONE_BITS + 1 - frac_bits + exp_offset})); } /** |