Index: vorbis-tools/oggenc/oggenc.c
===================================================================
--- vorbis-tools/oggenc/oggenc.c	(revision 19116)
+++ vorbis-tools/oggenc/oggenc.c	(revision 19117)
@@ -98,4 +98,6 @@
               0,0,0.f,
               0, 0, 0, 0, 0};
+    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
+      N_("RAW file reader")};
 
     int i;
@@ -240,6 +242,4 @@
         if(opt.rawmode)
         {
-            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
-                N_("RAW file reader")};
 
             enc_opts.rate=opt.raw_samplerate;
Index: vorbis-tools/oggenc/skeleton.h
===================================================================
--- vorbis-tools/oggenc/skeleton.h	(revision 19116)
+++ vorbis-tools/oggenc/skeleton.h	(revision 19117)
@@ -42,5 +42,5 @@
     ogg_int64_t start_granule;                             /* start granule value */
     ogg_uint32_t preroll;                                   /* preroll */
-    unsigned char granule_shift; // a 8-bit field           /* 1 byte value holding the granule shift */
+    unsigned char granule_shift;                            /* 1 byte value holding the granule shift */
     char *message_header_fields;                            /* holds all the message header fields */
     /* current total size of the message header fields, for realloc purpose, initially zero */
3bab274a6908ae1d9e834e'>commit</a><a href='/guix/diff/gnu/packages/gobby.scm?id=2884aac071a19233713bab274a6908ae1d9e834e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/gobby.scm'>
<input type='hidden' name='id' value='2884aac071a19233713bab274a6908ae1d9e834e'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=2884aac071a19233713bab274a6908ae1d9e834e&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=2884aac071a19233713bab274a6908ae1d9e834e&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/packages?id=2884aac071a19233713bab274a6908ae1d9e834e&amp;showmsg=1'>packages</a>/<a href='/guix/log/gnu/packages/gobby.scm?id=2884aac071a19233713bab274a6908ae1d9e834e&amp;showmsg=1'>gobby.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/gobby.scm?id=2884aac071a19233713bab274a6908ae1d9e834e'>Collapse</a>)</th><th class='left'>Author</th></tr>