From 0d230e9312a676266bd6fa3478032db4860221a7 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Mon, 13 Aug 2012 23:50:10 +0100 Subject: g723.1: simplify scale_vector() It is impossible for bits to be 15 here so the special case is not needed. Signed-off-by: Mans Rullgard --- libavcodec/g723_1.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libavcodec/g723_1.c') diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index fd03ed97d4..793b2d3dd9 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -283,12 +283,8 @@ static int scale_vector(int16_t *dst, const int16_t *vector, int length) max = FFMIN(max, 0x7FFF); 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; } -- cgit v1.2.3