summaryrefslogtreecommitdiff
path: root/libavcodec/sonic.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-23 19:42:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-23 19:42:24 +0200
commitdb27dadcb05ad3192759d59cebdc3268ee01aa82 (patch)
tree1324fa7004e1af35cebd968990bde70b38d11fdc /libavcodec/sonic.c
parentc329713de7c6bdfe58eec687487e7b79d72a2833 (diff)
sonic: replace divide() by ROUNDED_DIV()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sonic.c')
-rw-r--r--libavcodec/sonic.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 787cd552f3..716d68a88b 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -75,14 +75,6 @@ typedef struct SonicContext {
#define BASE_QUANT 0.6
#define RATE_VARIATION 3.0
-static inline int divide(int a, int b)
-{
- if (a < 0)
- return -( (-a + b/2)/b );
- else
- return (a + b/2)/b;
-}
-
static inline int shift(int a,int b)
{
return (a+(1<<(b-1))) >> b;
@@ -734,7 +726,7 @@ static int sonic_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
{
if (!s->lossless)
for (i = 0; i < s->block_align; i++)
- s->coded_samples[ch][i] = divide(s->coded_samples[ch][i], quant);
+ s->coded_samples[ch][i] = ROUNDED_DIV(s->coded_samples[ch][i], quant);
if ((ret = intlist_write(&pb, s->coded_samples[ch], s->block_align, 1)) < 0)
return ret;