[FFmpeg-cvslog] r20071 - in trunk/libavcodec: vorbis.c vorbis_dec.c vorbis_enc.c

[diego]

Author: diego
Date: Mon Sep 28 23:46:22 2009
New Revision: 20071

Log:
some more linebreak and brace placement cosmetics

Modified:
   trunk/libavcodec/vorbis.c
   trunk/libavcodec/vorbis_dec.c
   trunk/libavcodec/vorbis_enc.c

Modified: trunk/libavcodec/vorbis.c
==============================================================================
--- trunk/libavcodec/vorbis.c	Mon Sep 28 23:13:47 2009	(r20070)
+++ trunk/libavcodec/vorbis.c	Mon Sep 28 23:46:22 2009	(r20071)
@@ -39,7 +39,8 @@ unsigned int ff_vorbis_nth_root(unsigned
 
     do {
         ++ret;
-        for(i=0,j=ret;i<n-1;i++) j*=ret;
+        for(i=0,j=ret;i<n-1;i++)
+            j*=ret;
     } while (j<=x);
 
     return ret - 1;
@@ -62,14 +63,16 @@ int ff_vorbis_len2vlc(uint8_t *bits, uin
     GetBitContext gb;
 #endif
 
-    for(p=0;(bits[p]==0) && (p<num);++p);
+    for(p=0;(bits[p]==0) && (p<num);++p)
+        ;
     if (p==num) {
 //        av_log(vc->avccontext, 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<bits[p];++i)
         exit_at_level[i+1]=1<<i;
 
@@ -84,12 +87,16 @@ int ff_vorbis_len2vlc(uint8_t *bits, uin
     ++p;
 
     for(;p<num;++p) {
-        if (bits[p] > 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, uin
 
     //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_
         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
             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);
 }

Modified: trunk/libavcodec/vorbis_dec.c
==============================================================================
--- trunk/libavcodec/vorbis_dec.c	Mon Sep 28 23:13:47 2009	(r20070)
+++ trunk/libavcodec/vorbis_dec.c	Mon Sep 28 23:46:22 2009	(r20071)
@@ -747,9 +747,8 @@ static int vorbis_parse_setup_hdr_mappin
 
         if (mapping_setup->submaps>1) {
             mapping_setup->mux=av_mallocz(vc->audio_channels * sizeof(uint_fast8_t));
-            for(j=0;j<vc->audio_channels;++j) {
+            for(j=0;j<vc->audio_channels;++j)
                 mapping_setup->mux[j]=get_bits(gb, 4);
-            }
         }
 
         for(j=0;j<mapping_setup->submaps;++j) {
@@ -1162,7 +1161,8 @@ static uint_fast8_t vorbis_floor1_decode
     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
 

Modified: trunk/libavcodec/vorbis_enc.c
==============================================================================
--- trunk/libavcodec/vorbis_enc.c	Mon Sep 28 23:13:47 2009	(r20070)
+++ trunk/libavcodec/vorbis_enc.c	Mon Sep 28 23:46:22 2009	(r20071)
@@ -894,7 +894,8 @@ static int apply_window_and_mdct(vorbis_
     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++)