aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/lagarithrac.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-10 18:48:51 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-10 18:48:51 +0100
commitad4963a944644d390a813755ded833ba4a2ca367 (patch)
tree57b0e196784d6de0d423d3dc4bb0a992f784f29b /libavcodec/lagarithrac.h
parent5640ea43d7202e6bc6bc032079f66456323d1008 (diff)
parent0120e480bf0a1257299c8c84416a8814ccfcc73b (diff)
downloadffmpeg-ad4963a944644d390a813755ded833ba4a2ca367.tar.gz
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8: arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6 arm: hpeldsp: prevent overreads in armv6 asm lagarith: reallocate rgb_planes when needed lagarith: avoid infinite loop in lag_rac_refill() Conflicts: libavcodec/lagarith.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lagarithrac.h')
-rw-r--r--libavcodec/lagarithrac.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/lagarithrac.h b/libavcodec/lagarithrac.h
index 8c78538f21..5b884f0020 100644
--- a/libavcodec/lagarithrac.h
+++ b/libavcodec/lagarithrac.h
@@ -107,6 +107,9 @@ static inline uint8_t lag_get_rac(lag_rac *l)
l->range -= range_scaled * l->prob[255];
}
+ if (!l->range)
+ l->range = 0x80;
+
l->low -= range_scaled * l->prob[val];
return val;