diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-06-18 20:54:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-06-18 20:54:21 +0000 |
| commit | e079a1c94fcbe44a8ccde54d73667ebae26257ed (patch) | |
| tree | ba30d30c81a064e578735160b0bc14fbfa75d8ef /libavcodec | |
| parent | c79c1a01a74091ba6512e51dbf9912f8bfc0cbe8 (diff) | |
| download | ffmpeg-e079a1c94fcbe44a8ccde54d73667ebae26257ed.tar.gz | |
simplify
Originally committed as revision 13804 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/g726.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/g726.c b/libavcodec/g726.c index a40fd0c477..c7d16b19b3 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -198,10 +198,7 @@ static int16_t g726_decode(G726Context* c, int16_t I) ylint = (c->yl >> 15); ylfrac = (c->yl >> 10) & 0x1f; thr2 = (ylint > 9) ? 0x1f << 10 : (0x20 + ylfrac) << ylint; - if (c->td == 1 && abs(dq) > ((thr2+(thr2>>1))>>1)) - tr = 1; - else - tr = 0; + tr= (c->td == 1 && abs(dq) > ((3*thr2)>>2)); /* Update second order predictor coefficient A2 and A1 */ pk0 = (c->sez + dq) ? sgn(c->sez + dq) : 0; |