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/g726.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/g726.c')
| -rw-r--r-- | libavcodec/g726.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g726.c b/libavcodec/g726.c index b0331d8643..5b9986a212 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -219,7 +219,7 @@ static int16_t g726_decode(G726Context* c, int I) c->b[i] = 0; } else { /* This is a bit crazy, but it really is +255 not +256 */ - fa1 = av_clip((-c->a[0]*c->pk[0]*pk0)>>5, -256, 255); + fa1 = av_clip_intp2((-c->a[0]*c->pk[0]*pk0)>>5, 8); c->a[1] += 128*pk0*c->pk[1] + fa1 - (c->a[1]>>7); c->a[1] = av_clip(c->a[1], -12288, 12288); |