[SCM] libav/experimental: cosmetics: indentation after last commit
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:40:30 UTC 2013
The following commit has been merged in the experimental branch:
commit 6a85fb34c99f6010f7b5d2b6de0947abc4736b5e
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Mar 4 00:53:04 2009 +0000
cosmetics: indentation after last commit
Originally committed as revision 17796 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 3a88545..13549d8 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -231,33 +231,33 @@ static int metadata_parse(FLACContext *s)
int i, metadata_last, metadata_type, metadata_size;
int initial_pos= get_bits_count(&s->gb);
- skip_bits_long(&s->gb, 32);
+ skip_bits_long(&s->gb, 32);
- do {
- metadata_last = get_bits1(&s->gb);
- metadata_type = get_bits(&s->gb, 7);
- metadata_size = get_bits_long(&s->gb, 24);
+ do {
+ metadata_last = get_bits1(&s->gb);
+ metadata_type = get_bits(&s->gb, 7);
+ metadata_size = get_bits_long(&s->gb, 24);
- if (get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits) {
- skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb));
- break;
- }
+ if (get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits) {
+ skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb));
+ break;
+ }
- if (metadata_size) {
- switch (metadata_type) {
- case FLAC_METADATA_TYPE_STREAMINFO:
- if (!s->got_streaminfo) {
- ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s,
- s->gb.buffer+get_bits_count(&s->gb)/8);
- allocate_buffers(s);
- s->got_streaminfo = 1;
- }
- default:
- for (i = 0; i < metadata_size; i++)
- skip_bits(&s->gb, 8);
+ if (metadata_size) {
+ switch (metadata_type) {
+ case FLAC_METADATA_TYPE_STREAMINFO:
+ if (!s->got_streaminfo) {
+ ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s,
+ s->gb.buffer+get_bits_count(&s->gb)/8);
+ allocate_buffers(s);
+ s->got_streaminfo = 1;
}
+ default:
+ for (i = 0; i < metadata_size; i++)
+ skip_bits(&s->gb, 8);
}
- } while (!metadata_last);
+ }
+ } while (!metadata_last);
return 0;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list