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/takdec.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/takdec.c')
| -rw-r--r-- | libavcodec/takdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 2f0155d557..a453da81ec 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -476,7 +476,7 @@ static int decode_subframe(TAKDecContext *s, int32_t *decoded, s->residues[i + j + 1] * s->filter[j + 1] + s->residues[i + j ] * s->filter[j ]; } - v = (av_clip(v >> filter_quant, -8192, 8191) << dshift) - *decoded; + v = (av_clip_intp2(v >> filter_quant, 13) << dshift) - *decoded; *decoded++ = v; s->residues[filter_order + i] = v >> dshift; } @@ -652,7 +652,7 @@ static int decorrelate(TAKDecContext *s, int c1, int c2, int length) s->residues[i ] * s->filter[0]; } - v = (av_clip(v >> 10, -8192, 8191) << dshift) - *p1; + v = (av_clip_intp2(v >> 10, 13) << dshift) - *p1; *p1++ = v; } |