From 7da4dc17d97c7ec640382e1a2318e7dc53ebe6ea Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Tue, 14 Dec 2010 22:45:28 +0000
Subject: [PATCH] cosmetics: line wrap and spacing
Originally committed as revision 26011 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/ac3enc.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 7c0b93021a6..784ce870753 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -975,16 +975,19 @@ static int compute_bit_allocation(AC3EncodeContext *s,
offset until we can pack everything in the requested frame size */
bits_left = 8 * s->frame_size - (s->frame_bits + s->exponent_bits);
+
snr_offset = s->coarse_snr_offset << 4;
+
while (snr_offset >= 0 &&
- bit_alloc(s, mask, psd, bap, snr_offset) > bits_left)
+ bit_alloc(s, mask, psd, bap, snr_offset) > bits_left) {
snr_offset -= 64;
+ }
if (snr_offset < 0) {
return AVERROR(EINVAL);
}
+
while (snr_offset + 64 <= 1023 &&
- bit_alloc(s, mask, psd, bap1,
- snr_offset + 64) <= bits_left) {
+ bit_alloc(s, mask, psd, bap1, snr_offset + 64) <= bits_left) {
snr_offset += 64;
memcpy(bap, bap1, sizeof(bap1));
}
@@ -994,14 +997,12 @@ static int compute_bit_allocation(AC3EncodeContext *s,
memcpy(bap, bap1, sizeof(bap1));
}
while (snr_offset + 4 <= 1023 &&
- bit_alloc(s, mask, psd, bap1,
- snr_offset + 4) <= bits_left) {
+ bit_alloc(s, mask, psd, bap1, snr_offset + 4) <= bits_left) {
snr_offset += 4;
memcpy(bap, bap1, sizeof(bap1));
}
while (snr_offset + 1 <= 1023 &&
- bit_alloc(s, mask, psd, bap1,
- snr_offset + 1) <= bits_left) {
+ bit_alloc(s, mask, psd, bap1, snr_offset + 1) <= bits_left) {
snr_offset++;
memcpy(bap, bap1, sizeof(bap1));
}
--
GitLab