diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 11:24:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 11:27:24 +0100 |
| commit | 66d79aa2e1351ac38f3469bba6a8b1fcaefa0c20 (patch) | |
| tree | c078cd42cba697c15473aeaae0a127bd0e64a74a /libavcodec/opus_celt.c | |
| parent | 1253091d6f7b2910f3a53ab648fb3d0cb1a4b4ee (diff) | |
| parent | 9abc80f1ed673141326341e26a05c3e1f78576d0 (diff) | |
| download | ffmpeg-66d79aa2e1351ac38f3469bba6a8b1fcaefa0c20.tar.gz | |
Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'
* commit '9abc80f1ed673141326341e26a05c3e1f78576d0':
libavcodec: Make use of av_clip functions
Conflicts:
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/opus_celt.c')
| -rw-r--r-- | libavcodec/opus_celt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opus_celt.c b/libavcodec/opus_celt.c index aa11bde85c..e5d615efbd 100644 --- a/libavcodec/opus_celt.c +++ b/libavcodec/opus_celt.c @@ -1909,7 +1909,7 @@ static void celt_decode_bands(CeltContext *s, OpusRangeCoder *rc) s->remaining2 = totalbits - consumed - 1; if (i <= s->codedbands - 1) { int curr_balance = s->remaining / FFMIN(3, s->codedbands-i); - b = av_clip(FFMIN(s->remaining2 + 1, s->pulses[i] + curr_balance), 0, 16383); + b = av_clip_uintp2(FFMIN(s->remaining2 + 1, s->pulses[i] + curr_balance), 14); } else b = 0; |