From e10c353ca5c34054aa42bbfba3c992ca947c59db Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Sun, 8 Nov 2015 17:19:10 +0100 Subject: [PATCH] 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 Signed-off-by: Andreas Cadhalpun (cherry picked from commit 9ac61e73d0843ec4b83f4e3d47eded73234e406e) Signed-off-by: Michael Niedermayer --- libavutil/softfloat.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index 651bbf4111..facfbc2424 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})); } /**