summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2010-12-14 22:45:28 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2010-12-14 22:45:28 +0000
commit7da4dc17d97c7ec640382e1a2318e7dc53ebe6ea (patch)
treed61d0f4a75f331468f25adceae146c1c404a9ec5 /libavcodec
parenta0d763fc88d994e00ff8f5e33562046b8859ce60 (diff)
cosmetics: line wrap and spacing
Originally committed as revision 26011 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ac3enc.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 7c0b93021a..784ce87075 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));
}