[SCM] libav/experimental: 10l: Fix mistake in r26044. Check increment bounds using actual increment instead of 64. This will change output in some cases, but it happens to not affect the AC-3 regression tests.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:21:13 UTC 2013


The following commit has been merged in the experimental branch:
commit 5128842ea2057c86550b833c9141c271df1bdc94
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Fri Dec 31 22:59:19 2010 +0000

    10l: Fix mistake in r26044. Check increment bounds using actual increment
    instead of 64. This will change output in some cases, but it happens to not
    affect the AC-3 regression tests.
    
    Originally committed as revision 26180 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index f5ee933..9b23f31 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1125,7 +1125,7 @@ static int cbr_bit_allocation(AC3EncodeContext *s)
 
     FFSWAP(uint8_t *, s->bap_buffer, s->bap1_buffer);
     for (snr_incr = 64; snr_incr > 0; snr_incr >>= 2) {
-        while (snr_offset + 64 <= 1023 &&
+        while (snr_offset + snr_incr <= 1023 &&
                bit_alloc(s, snr_offset + snr_incr) <= bits_left) {
             snr_offset += snr_incr;
             FFSWAP(uint8_t *, s->bap_buffer, s->bap1_buffer);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list