diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 13:37:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 13:50:24 +0200 |
| commit | fa8511851090537f6898fc50d7e6cf56841cf6ab (patch) | |
| tree | cc6e217fd99f5080a4726e1c74a6840962e1ff80 /libavcodec/mss12.h | |
| parent | a7fbc7d7b7eabc74ceb1970a995c56043315e433 (diff) | |
| parent | 9afb7061f938831248942050cfdb449e014ed427 (diff) | |
| download | ffmpeg-fa8511851090537f6898fc50d7e6cf56841cf6ab.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Pass a separate AVIOContext for reading
af_asyncts: check return value from lavr when flushing.
mss2: simplify loop in decode_rle()
mss12: avoid unnecessary division in arith*_get_bit()
mss2: do not try to read too many palette entries
mpegvideo: set AVFrame fields to NULL after freeing the base memory
configure: Set the right cc_e flags for msvc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss12.h')
| -rw-r--r-- | libavcodec/mss12.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h index ba80030ee3..42ceab568f 100644 --- a/libavcodec/mss12.h +++ b/libavcodec/mss12.h @@ -103,7 +103,7 @@ av_cold int ff_mss12_decode_end(MSS12Context *ctx); static int arith ## VERSION ## _get_bit(ArithCoder *c) \ { \ int range = c->high - c->low + 1; \ - int bit = (((c->value - c->low) << 1) + 1) / range; \ + int bit = 2 * c->value - c->low >= c->high; \ \ if (bit) \ c->low += range >> 1; \ |