From 0b8e7ab059f3038a6a662ea743f4f7d2de6722ef Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 28 Sep 2009 21:46:22 +0000 Subject: [PATCH] some more linebreak and brace placement cosmetics Originally committed as revision 20071 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/vorbis.c | 36 ++++++++++++++++++++++++------------ libavcodec/vorbis_dec.c | 6 +++--- libavcodec/vorbis_enc.c | 3 ++- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index 5fa96c6186..3b9440ae58 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -39,7 +39,8 @@ unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n) do { ++ret; - for(i=0,j=ret;iavccontext, AV_LOG_INFO, "An empty codebook. Heh?! \n"); return 0; } codes[p]=0; - if (bits[p] > 32) return 1; + if (bits[p] > 32) + return 1; for(i=0;i 32) return 1; - if (bits[p]==0) continue; + if (bits[p] > 32) + return 1; + if (bits[p]==0) + continue; // find corresponding exit(node which the tree can grow further from) for(i=bits[p];i>0;--i) - if (exit_at_level[i]) break; - if (!i) return 1; // overspecified tree + if (exit_at_level[i]) + break; + if (!i) // overspecified tree + return 1; code=exit_at_level[i]; exit_at_level[i]=0; // construct code (append 0s to end) and introduce new exits @@ -109,7 +116,8 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) //no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC) for (p=1; p<33; p++) - if (exit_at_level[p]) return 1; + if (exit_at_level[p]) + return 1; return 0; } @@ -127,9 +135,11 @@ void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values) for (j = 2; j < i; j++) { int tmp = list[j].x; if (tmp < list[i].x) { - if (tmp > list[list[i].low].x) list[i].low = j; + if (tmp > list[list[i].low].x) + list[i].low = j; } else { - if (tmp < list[list[i].high].x) list[i].high = j; + if (tmp < list[list[i].high].x) + list[i].high = j; } } } @@ -212,7 +222,9 @@ void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values, lx = x1; ly = y1; } - if (lx >= samples) break; + if (lx >= samples) + break; } - if (lx < samples) render_line(lx, ly, samples, ly, out); + if (lx < samples) + render_line(lx, ly, samples, ly, out); } diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index 4aadce5613..3f5de176c1 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -747,9 +747,8 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) if (mapping_setup->submaps>1) { mapping_setup->mux=av_mallocz(vc->audio_channels * sizeof(uint_fast8_t)); - for(j=0;jaudio_channels;++j) { + for(j=0;jaudio_channels;++j) mapping_setup->mux[j]=get_bits(gb, 4); - } } for(j=0;jsubmaps;++j) { @@ -1162,7 +1161,8 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, int_fast16_t dy, err; - if (!get_bits1(gb)) return 1; // silence + if (!get_bits1(gb)) // silence + return 1; // Read values (or differences) for the floor's points diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c index b188d89c06..1d36a734c3 100644 --- a/libavcodec/vorbis_enc.c +++ b/libavcodec/vorbis_enc.c @@ -894,7 +894,8 @@ static int apply_window_and_mdct(vorbis_enc_context * venc, float n = (float)(1 << venc->log2_blocksize[0]) / 4.; // FIXME use dsp - if (!venc->have_saved && !samples) return 0; + if (!venc->have_saved && !samples) + return 0; if (venc->have_saved) for (channel = 0; channel < venc->channels; channel++) -- GitLab