summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-01-24 18:52:30 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-01-24 18:52:30 +0000
commit1df0390eedb4e8c6c529378ed9c0b69f5c477b73 (patch)
treed233fa948b73a98147a7cd9b2ba6bb924f1663c4 /libavcodec
parent1bec121f9e16e428c70ffddf593f0510579cdc14 (diff)
flacdec: cosmetics: indentation
Originally committed as revision 16762 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/flacdec.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 488f14fdef..a737a5f74c 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -545,28 +545,28 @@ static int flac_decode_frame(AVCodecContext *avctx,
}
if (1 && s->max_framesize) { //FIXME truncated
- if (s->bitstream_size < 4 || AV_RL32(s->bitstream) != MKTAG('f','L','a','C'))
- buf_size= FFMIN(buf_size, s->max_framesize - FFMIN(s->bitstream_size, s->max_framesize));
- input_buf_size= buf_size;
+ if (s->bitstream_size < 4 || AV_RL32(s->bitstream) != MKTAG('f','L','a','C'))
+ buf_size= FFMIN(buf_size, s->max_framesize - FFMIN(s->bitstream_size, s->max_framesize));
+ input_buf_size= buf_size;
- if (s->bitstream_size + buf_size < buf_size || s->bitstream_index + s->bitstream_size + buf_size < s->bitstream_index)
- return -1;
+ if (s->bitstream_size + buf_size < buf_size || s->bitstream_index + s->bitstream_size + buf_size < s->bitstream_index)
+ return -1;
- if (s->allocated_bitstream_size < s->bitstream_size + buf_size)
- s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->bitstream_size + buf_size);
+ if (s->allocated_bitstream_size < s->bitstream_size + buf_size)
+ s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->bitstream_size + buf_size);
- if (s->bitstream_index + s->bitstream_size + buf_size > s->allocated_bitstream_size) {
- memmove(s->bitstream, &s->bitstream[s->bitstream_index], s->bitstream_size);
- s->bitstream_index=0;
- }
- memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size], buf, buf_size);
- buf= &s->bitstream[s->bitstream_index];
- buf_size += s->bitstream_size;
- s->bitstream_size= buf_size;
+ if (s->bitstream_index + s->bitstream_size + buf_size > s->allocated_bitstream_size) {
+ memmove(s->bitstream, &s->bitstream[s->bitstream_index], s->bitstream_size);
+ s->bitstream_index=0;
+ }
+ memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size], buf, buf_size);
+ buf= &s->bitstream[s->bitstream_index];
+ buf_size += s->bitstream_size;
+ s->bitstream_size= buf_size;
- if (buf_size < s->max_framesize && input_buf_size) {
- return input_buf_size;
- }
+ if (buf_size < s->max_framesize && input_buf_size) {
+ return input_buf_size;
+ }
}
init_get_bits(&s->gb, buf, buf_size*8);