aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-01 12:41:43 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-01 13:26:12 +0100
commit3a9cb18855d29c96a5d9d2f5ad30448cae3a2ddf (patch)
tree8a4edd516119109b0e671ac502c27b5779e53cf0
parent8e7f4520226d2d9ad6a58ad6c32d1455a8b244b2 (diff)
downloadffmpeg-3a9cb18855d29c96a5d9d2f5ad30448cae3a2ddf.tar.gz
avutil/integer: Fix av_mod_i() with negative dividend
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavutil/integer.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/integer.c b/libavutil/integer.c
index 5bcde0dc6e..6d6855fa1b 100644
--- a/libavutil/integer.c
+++ b/libavutil/integer.c
@@ -29,6 +29,8 @@
#include "integer.h"
#include "avassert.h"
+static const AVInteger zero_i;
+
AVInteger av_add_i(AVInteger a, AVInteger b){
int i, carry=0;
@@ -111,6 +113,12 @@ AVInteger av_mod_i(AVInteger *quot, AVInteger a, AVInteger b){
AVInteger quot_temp;
if(!quot) quot = &quot_temp;
+ if ((int16_t)a.v[AV_INTEGER_SIZE-1] < 0) {
+ a = av_mod_i(quot, av_sub_i(zero_i, a), b);
+ *quot = av_sub_i(zero_i, *quot);
+ return av_sub_i(zero_i, a);
+ }
+
av_assert2((int16_t)a.v[AV_INTEGER_SIZE-1] >= 0 && (int16_t)b.v[AV_INTEGER_SIZE-1] >= 0);
av_assert2(av_log2_i(b)>=0);