From 64c82a7411ec88ddbbad9b7803eb6c0c58c666f6 Mon Sep 17 00:00:00 2001
From: Oded Shimon <ods15@ods15.dyndns.org>
Date: Mon, 2 Oct 2006 06:09:30 +0000
Subject: [PATCH] Original Commit: r105 | ods15 | 2006-10-01 18:09:55 +0200
(Sun, 01 Oct 2006) | 2 lines
slight simplification for channel coupling
Originally committed as revision 6509 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/vorbis_enc.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index b43738f3a1..8922829977 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -1424,17 +1424,10 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack
float * ang = venc->coeffs + mapping->angle[i] * samples;
int j;
for (j = 0; j < samples; j++) {
- float m = mag[j];
float a = ang[j];
- if (m > 0) {
- ang[j] = m - a;
- if (a > m) mag[j] = a;
- else mag[j] = m;
- } else {
- ang[j] = a - m;
- if (a > m) mag[j] = m;
- else mag[j] = a;
- }
+ ang[j] -= mag[j];
+ if (mag[j] > 0) ang[j] = -ang[j];
+ if (ang[j] < 0) mag[j] = a;
}
}