[SCM] libav/experimental: Simplify eval_refl(): do not store a buffer value in a var when the buffer could be used directly
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:27:07 UTC 2013
The following commit has been merged in the experimental branch:
commit bdb34c9f5e490214b3dbcad9c2b09d48fb9018cf
Author: Vitor Sessak <vitor1001 at gmail.com>
Date: Wed Aug 6 21:16:24 2008 +0000
Simplify eval_refl(): do not store a buffer value in a var when the buffer could be used directly
Originally committed as revision 14652 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index 2af7613..bd91c63 100644
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -236,15 +236,15 @@ static int eval_refl(int *refl, const int16_t *coefs, RA144Context *ractx)
for (i=0; i < 10; i++)
buffer2[i] = coefs[i];
- u = refl[9] = bp2[9];
+ refl[9] = bp2[9];
- if (u + 0x1000 > 0x1fff) {
+ if ((unsigned) bp2[9] + 0x1000 > 0x1fff) {
av_log(ractx, AV_LOG_ERROR, "Overflow. Broken sample?\n");
return 1;
}
for (c=8; c >= 0; c--) {
- b = 0x1000-((u * u) >> 12);
+ b = 0x1000-((bp2[c+1] * bp2[c+1]) >> 12);
if (!b)
b = -2;
@@ -252,9 +252,9 @@ static int eval_refl(int *refl, const int16_t *coefs, RA144Context *ractx)
for (u=0; u<=c; u++)
bp1[u] = ((bp2[u] - ((refl[c+1] * bp2[c-u]) >> 12)) * (0x1000000 / b)) >> 12;
- refl[c] = u = bp1[c];
+ refl[c] = bp1[c];
- if ((u + 0x1000) > 0x1fff)
+ if ((unsigned) bp1[c] + 0x1000 > 0x1fff)
return 1;
FFSWAP(int *, bp1, bp2);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list