[FFmpeg-cvslog] g723_1dec: remove dead code that leaked in from libav
Michael Niedermayer
git at videolan.org
Mon Aug 13 15:42:56 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 13 15:02:21 2012 +0200| [20035fa24103da9199de3515ca75ba1f6bb275aa] | committer: Michael Niedermayer
g723_1dec: remove dead code that leaked in from libav
It appears someone thinks this special case can be reached
Well, it cannot, thus not only do we not need to optimize it
we dont need it at all
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20035fa24103da9199de3515ca75ba1f6bb275aa
---
libavcodec/g723_1.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index a8ca75f..ae73799 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1.c
@@ -259,12 +259,8 @@ static int scale_vector(int16_t *dst, const int16_t *vector, int length)
bits = normalize_bits(max, 15);
- if (bits == 15)
- for (i = 0; i < length; i++)
- dst[i] = vector[i] * 0x7fff >> 3;
- else
- for (i = 0; i < length; i++)
- dst[i] = vector[i] << bits >> 3;
+ for (i = 0; i < length; i++)
+ dst[i] = vector[i] << bits >> 3;
return bits - 3;
}
More information about the ffmpeg-cvslog
mailing list