[SCM] libav/experimental: Original Commit: r104 | ods15 | 2006-10-01 18:04:08 +0200 (Sun, 01 Oct 2006) | 2 lines

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c2ee47ac060c84ee7b858d3517fd07ca05d2e800
Author: Oded Shimon <ods15 at ods15.dyndns.org>
Date:   Mon Oct 2 06:09:28 2006 +0000

    Original Commit: r104 | ods15 | 2006-10-01 18:04:08 +0200 (Sun, 01 Oct 2006) | 2 lines
    
    somewhat cosmetic formatting, use FFMAX
    
    Originally committed as revision 6508 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index 964e1a1..b43738f 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -1253,8 +1253,8 @@ static void residue_encode(venc_context_t * venc, residue_t * rc, PutBitContext
         float max1 = 0., max2 = 0.;
         int s = rc->begin + p * psize;
         for (k = s; k < s + psize; k += 2) {
-            if (fabs(coeffs[k / real_ch]) > max1) max1 = fabs(coeffs[k / real_ch]);
-            if (fabs(coeffs[samples + k / real_ch]) > max2) max2 = fabs(coeffs[samples + k / real_ch]);
+            max1 = FFMAX(max1, fabs(coeffs[          k / real_ch]));
+            max2 = FFMAX(max2, fabs(coeffs[samples + k / real_ch]));
         }
 
         for (i = 0; i < rc->classifications - 1; i++) {

-- 
Libav/FFmpeg packaging