[FFmpeg-cvslog] softfloat: handle INT_MIN correctly in av_int2sf
Andreas Cadhalpun
git at videolan.org
Sun Nov 8 21:10:09 CET 2015
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Sun Nov 8 17:19:10 2015 +0100| [9ac61e73d0843ec4b83f4e3d47eded73234e406e] | committer: Andreas Cadhalpun
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 at niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ac61e73d0843ec4b83f4e3d47eded73234e406e
---
libavutil/softfloat.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index 4cc3ceb..5b285e3 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}));
}
/**
More information about the ffmpeg-cvslog
mailing list