remove needless whitespace, synchronize decls with defs

svn path=/trunk/vorbis/; revision=7485

diff --git a/ChangeLog b/ChangeLog
index 9c2454a..a488253 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-08-05  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+       * include/vorbis/codec.h:
+       * include/vorbis/vorbisenc.h:
+       * include/vorbis/vorbisfile.h:
+         remove end-of-line whitespace, synchronize declarations
+         with definitions
+
+2004-08-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
        * Makefile.am:
        * doc/Makefile.am:
        * doc/xml/a2-encapsulation_rtp.xml:

diff --git a/include/vorbis/codec.h b/include/vorbis/codec.h
index 2a68189..617f7f4 100644 (file)
--- a/include/vorbis/codec.h
+++ b/include/vorbis/codec.h
@@ -32,14 +32,14 @@ typedef struct vorbis_info{
 
   /* The below bitrate declarations are *hints*.
      Combinations of the three values carry the following implications:
-     
-     all three set to the same value: 
+
+     all three set to the same value:
        implies a fixed rate bitstream
-     only nominal set: 
-       implies a VBR stream that averages the nominal bitrate.  No hard 
+     only nominal set:
+       implies a VBR stream that averages the nominal bitrate.  No hard
        upper/lower limit
-     upper and or lower set: 
-       implies a VBR bitstream that obeys the bitrate limits. nominal 
+     upper and or lower set:
+       implies a VBR bitstream that obeys the bitrate limits. nominal
        may also be set to give a nominal rate.
      none set:
        the coder does not care to speculate.
@@ -87,9 +87,9 @@ typedef struct vorbis_dsp_state{
 
 typedef struct vorbis_block{
   /* necessary stream state for linking to the framing abstraction */
-  float  **pcm;       /* this is a pointer into local storage */ 
+  float  **pcm;       /* this is a pointer into local storage */
   oggpack_buffer opb;
-  
+
   long  lW;
   long  W;
   long  nW;
@@ -166,8 +166,8 @@ extern void     vorbis_info_init(vorbis_info *vi);
 extern void     vorbis_info_clear(vorbis_info *vi);
 extern int      vorbis_info_blocksize(vorbis_info *vi,int zo);
 extern void     vorbis_comment_init(vorbis_comment *vc);
-extern void     vorbis_comment_add(vorbis_comment *vc, char *comment); 
-extern void     vorbis_comment_add_tag(vorbis_comment *vc, 
+extern void     vorbis_comment_add(vorbis_comment *vc, char *comment);
+extern void     vorbis_comment_add_tag(vorbis_comment *vc,
                                       char *tag, char *contents);
 extern char    *vorbis_comment_query(vorbis_comment *vc, char *tag, int count);
 extern int      vorbis_comment_query_count(vorbis_comment *vc, char *tag);
@@ -216,7 +216,7 @@ extern int      vorbis_synthesis_halfrate_p(vorbis_info *v);
 
 /* Vorbis ERRORS and return codes ***********************************/
 
-#define OV_FALSE      -1  
+#define OV_FALSE      -1
 #define OV_EOF        -2
 #define OV_HOLE       -3
 

diff --git a/include/vorbis/vorbisenc.h b/include/vorbis/vorbisenc.h
index d76ffd4..211ea39 100644 (file)
--- a/include/vorbis/vorbisenc.h
+++ b/include/vorbis/vorbisenc.h
@@ -28,7 +28,7 @@ extern "C"
 extern int vorbis_encode_init(vorbis_info *vi,
                              long channels,
                              long rate,
-                             
+
                              long max_bitrate,
                              long nominal_bitrate,
                              long min_bitrate);
@@ -36,22 +36,22 @@ extern int vorbis_encode_init(vorbis_info *vi,
 extern int vorbis_encode_setup_managed(vorbis_info *vi,
                                       long channels,
                                       long rate,
-                                      
+
                                       long max_bitrate,
                                       long nominal_bitrate,
                                       long min_bitrate);
-  
+
 extern int vorbis_encode_setup_vbr(vorbis_info *vi,
                                  long channels,
                                  long rate,
-                                 
-                                 float /* quality level from 0. (lo) to 1. (hi) */
+
+                                 float quality /* quality level from 0. (lo) to 1. (hi) */
                                  );
 
 extern int vorbis_encode_init_vbr(vorbis_info *vi,
                                  long channels,
                                  long rate,
-                                 
+
                                  float base_quality /* quality level from 0. (lo) to 1. (hi) */
                                  );
 

diff --git a/include/vorbis/vorbisfile.h b/include/vorbis/vorbisfile.h
index da7ce70..1f207e8 100644 (file)
--- a/include/vorbis/vorbisfile.h
+++ b/include/vorbis/vorbisfile.h
@@ -27,11 +27,11 @@ extern "C"
 #include "codec.h"
 
 /* The function prototypes for the callbacks are basically the same as for
- * the stdio functions fread, fseek, fclose, ftell. 
+ * the stdio functions fread, fseek, fclose, ftell.
  * The one difference is that the FILE * arguments have been replaced with
  * a void * - this is to be used as a pointer to whatever internal data these
  * functions might need. In the stdio case, it's just a FILE * cast to a void *
- * 
+ *
  * If you use other functions, check the docs for these functions and return
  * the right values. For seek_func(), you *MUST* return -1 if the stream is
  * unseekable
@@ -54,7 +54,7 @@ typedef struct OggVorbis_File {
   int              seekable;
   ogg_int64_t      offset;
   ogg_int64_t      end;
-  ogg_sync_state   oy; 
+  ogg_sync_state   oy;
 
   /* If the FILE handle isn't seekable (eg, a pipe), only the current
      stream appears */