diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-11-25 18:46:35 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-11-26 11:38:41 +0000 |
| commit | 644bff6c9bf15b5ed723a893236dbc8c29579c93 (patch) | |
| tree | a124f80d82ad582c2c20d62af3acdfe90854c4f2 | |
| parent | 93c286e54f5f695c9352d0034f5a417b79aecc2f (diff) | |
| download | ffmpeg-644bff6c9bf15b5ed723a893236dbc8c29579c93.tar.gz | |
apedec: fix signed integer overflows
This bit manipulation is equivalent but avoids undefined
shifts and overflows.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/apedec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 6c3d29e3bb..7702b291c8 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -690,7 +690,7 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f, /* Update the adaption coefficients */ absres = FFABS(res); if (absres) - *f->adaptcoeffs = ((res & (1<<31)) - (1<<30)) >> + *f->adaptcoeffs = ((res & (-1<<31)) ^ (-1<<30)) >> (25 + (absres <= f->avg*3) + (absres <= f->avg*4/3)); else *f->adaptcoeffs = 0; |